Merge pull request #1048 from owncloud/shareWithYou_icon_in_fileList

[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 96654b0..9a952e4 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();
             }
 


@@ -405,23 +405,14 @@ public class FileActivity extends ActionBarActivity
 
         /// choose the appropiate title
         if (chosenFile == null) {
 
         /// 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();
             title = chosenFile.getFileName();

-            inRoot = false;

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