소스 검색

Allow to set Menu.NONE

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 11 달 전
부모
커밋
06ad7d0239

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -871,7 +871,7 @@ public abstract class DrawerActivity extends ToolbarActivity
      *
      */
     public void setDrawerMenuItemChecked() {
-        if (menuItemId == Menu.NONE || mNavigationView == null) {
+        if (mNavigationView == null) {
             return;
         }
 

+ 7 - 9
app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -1158,22 +1158,20 @@ public class FileDisplayActivity extends FileActivity
 
         Log_OC.v(TAG, "onResume() end");
     }
-
     private void setDrawerAllFiles() {
         if (MainApp.isOnlyPersonFiles()) {
             menuItemId = R.id.nav_personal_files;
-            setDrawerMenuItemChecked();
-            setupHomeSearchToolbarWithSortAndListButtons();
         } else if (MainApp.isOnlyOnDevice()) {
             menuItemId = R.id.nav_on_device;
-            setDrawerMenuItemChecked();
+        } else if (menuItemId == Menu.NONE) {
+            menuItemId = R.id.nav_all_files;
+        }
+
+        setDrawerMenuItemChecked();
+
+        if (MainApp.isOnlyOnDevice()) {
             setupToolbar();
         } else {
-            if (menuItemId == Menu.NONE) {
-                menuItemId = R.id.nav_all_files;
-            }
-
-            setDrawerMenuItemChecked();
             setupHomeSearchToolbarWithSortAndListButtons();
         }
     }