Fix, Title is not correct when rotating the device

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 96654b0..19960e3 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(mFile);
+                updateActionBarTitleAndHomeButton(null);

                 invalidateOptionsMenu();
             }
 
                 invalidateOptionsMenu();
             }
 


@@ -406,22 +406,18 @@ 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

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

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

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

             }
 
             }
 

-        } else {
+        } else if (chosenFile.getParentId() != 0){

             // chosenFile determines the title, instead of mFile
             title = chosenFile.getFileName();
             inRoot = false;
             // chosenFile determines the title, instead of mFile
             title = chosenFile.getFileName();
             inRoot = false;

+
+        } else{
+            inRoot = true;

         }
 
         /// set the chosen title
         }
 
         /// set the chosen title

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index a851c00..b1c0ffb 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1160,7 +1160,7 @@ public class FileDisplayActivity extends HookActivity
     protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
         if (mDualPane) {
             // in dual pane mode, keep the focus of title an action bar in the current folder
     protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
         if (mDualPane) {
             // in dual pane mode, keep the focus of title an action bar in the current folder

-            super.updateActionBarTitleAndHomeButton(null);
+            super.updateActionBarTitleAndHomeButton(getCurrentDir());

 
         } else {
             super.updateActionBarTitleAndHomeButton(chosenFile);
 
         } else {
             super.updateActionBarTitleAndHomeButton(chosenFile);