X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/65ff5a374aef368792a0238d59a598d0cb45437a..ff82b51e49f40155e7c340090f5ee759af2bf3ad:/src/com/owncloud/android/ui/activity/FileActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 96654b00..9a952e41 100644
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -373,7 +373,7 @@ public class FileActivity extends ActionBarActivity
             /** Called when a drawer has settled in a completely closed state. */
             public void onDrawerClosed(View view) {
                 super.onDrawerClosed(view);
-                updateActionBarTitleAndHomeButton(mFile);
+                updateActionBarTitleAndHomeButton(null);
                 invalidateOptionsMenu();
             }
 
@@ -405,23 +405,14 @@ public class FileActivity extends ActionBarActivity
 
         /// choose the appropiate title
         if (chosenFile == null) {
-            // mFile determines the title
-            OCFile currentDir = null;
-            if (mFile != null && mFile.isFolder()) {
-                currentDir = mFile;
-            } else {
-                currentDir = getStorageManager().getFileById(mFile.getParentId());
-            }
-            inRoot = (mFile == null || currentDir.getParentId() == 0);
-            if (!inRoot) {
-                    title = mFile.getFileName();
-
-            }
-
-        } else {
-            // 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;
         }
 
         /// set the chosen title