From 0f0e210d6979f45a1f9609371bb39cbb5faee6fe Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Thu, 2 Jul 2015 13:03:48 +0200 Subject: [PATCH] Fixed title in action bar when user clicks on upload notification in progress / failed --- .../owncloud/android/ui/activity/FileActivity.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index 19960e3b..9a952e41 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -405,19 +405,14 @@ public class FileActivity extends ActionBarActivity /// choose the appropiate title if (chosenFile == null) { - // mFile determines the title - inRoot = (mFile == null || mFile.getParentId() == 0); - if (!inRoot) { - title = mFile.getFileName(); - } - - } else if (chosenFile.getParentId() != 0){ - // chosenFile determines the title, instead of mFile + chosenFile = mFile; // if no file is passed, current file decides + } + inRoot = ( + chosenFile == null || + (chosenFile.isFolder() && chosenFile.getParentId() == FileDataStorageManager.ROOT_PARENT_ID) + ); + if (!inRoot) { title = chosenFile.getFileName(); - inRoot = false; - - } else{ - inRoot = true; } /// set the chosen title -- 2.11.0