Fix, title is not correct when menu is shown and rotate

[pub/Android/ownCloud.git] / 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 c37477c..96654b0 100644 (file)
--- 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);
             /** Called when a drawer has settled in a completely closed state. */
             public void onDrawerClosed(View view) {
                 super.onDrawerClosed(view);

-                updateActionBarTitleAndHomeButton(null);
+                updateActionBarTitleAndHomeButton(mFile);

                 invalidateOptionsMenu();
             }
 
                 invalidateOptionsMenu();
             }
 


@@ -406,9 +406,16 @@ public class FileActivity extends ActionBarActivity
         /// choose the appropiate title
         if (chosenFile == null) {
             // mFile determines the title
         /// choose the appropiate title
         if (chosenFile == null) {
             // mFile determines the title

-            inRoot = (mFile == null || mFile.getParentId() == 0);
+            OCFile currentDir = null;
+            if (mFile != null && mFile.isFolder()) {
+                currentDir = mFile;
+            } else {
+                currentDir = getStorageManager().getFileById(mFile.getParentId());
+            }
+            inRoot = (mFile == null || currentDir.getParentId() == 0);

             if (!inRoot) {
             if (!inRoot) {

-                title = mFile.getFileName();
+                    title = mFile.getFileName();
+

             }
 
         } else {
             }
 
         } else {