Merge pull request #10217 from nextcloud/fix/on-device-crash

Fix crash when navigating from Gallery to On device

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -2282,8 +2282,10 @@ public class FileDisplayActivity extends FileActivity
             updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_item_on_device));
         }
         OCFileListFragment ocFileListFragment = getListOfFilesFragment();
-        if (ocFileListFragment != null) {
+        if (ocFileListFragment != null && !(ocFileListFragment instanceof GalleryFragment) && !(ocFileListFragment instanceof SharedListFragment)) {
             ocFileListFragment.refreshDirectory();
+        } else {
+            setLeftFragment(new OCFileListFragment());
         }
     }
 

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -410,7 +410,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
             FileDisplayActivity fileDisplayActivity = (FileDisplayActivity) fragmentActivity;
             fileDisplayActivity.updateActionBarTitleAndHomeButton(fileDisplayActivity.getCurrentDir());
         }
-        listDirectory(false, false);
+        listDirectory(MainApp.isOnlyOnDevice(), false);
     }
 
     protected void setAdapter(Bundle args) {