From: masensio <masensio@solidgear.es>
Date: Fri, 5 Jun 2015 10:26:12 +0000 (+0200)
Subject: Fix, Title is not correct when rotating the device
X-Git-Tag: oc-android-1.7.2~1^2~23^2~10
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6cf7c72ce3cd3189893d5c16da6f5118942c9a13?ds=inline;hp=--cc

Fix, Title is not correct when rotating the device
---

6cf7c72ce3cd3189893d5c16da6f5118942c9a13
diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 96654b00..19960e3b 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();
             }
 
@@ -406,22 +406,18 @@ 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);
+            inRoot = (mFile == null || mFile.getParentId() == 0);
             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;
+
+        } else{
+            inRoot = true;
         }
 
         /// 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 a851c006..b1c0ffbe 100644
--- 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
-            super.updateActionBarTitleAndHomeButton(null);
+            super.updateActionBarTitleAndHomeButton(getCurrentDir());
 
         } else {
             super.updateActionBarTitleAndHomeButton(chosenFile);