瀏覽代碼

Don't show new appbar with DeviceOnly

Signed-off-by: Joris Bodin <joris.bodin@infomaniak.com>
Joris Bodin 5 年之前
父節點
當前提交
f33b3bf5ca

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

@@ -406,13 +406,12 @@ public abstract class DrawerActivity extends ToolbarActivity
 
         switch (menuItem.getItemId()) {
             case R.id.nav_all_files:
+                showFiles(false);
                 if ((this instanceof FileDisplayActivity) &&
                     !(((FileDisplayActivity) this).getListOfFilesFragment() instanceof PhotoFragment)) {
                     ((FileDisplayActivity) this).browseToRoot();
-                    showFiles(false);
                     EventBus.getDefault().post(new ChangeMenuEvent());
                 } else {
-                    showFiles(false);
                     Intent intent = new Intent(getApplicationContext(), FileDisplayActivity.class);
                     intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                     intent.setAction(FileDisplayActivity.ALL_FILES);

+ 1 - 0
src/main/java/com/owncloud/android/ui/activity/FileActivity.java

@@ -158,6 +158,7 @@ public abstract class FileActivity extends DrawerActivity
     public void showFiles(boolean onDeviceOnly) {
         // must be specialized in subclasses
         MainApp.showOnlyFilesOnDevice(onDeviceOnly);
+        setupToolbar(!onDeviceOnly);
     }
 
     /**