Merge pull request #7375 from nextcloud/fileDetailLeftFragment

FileDetailFragment also uses left fragment
nextcloud · Nov 23, 2020 · 879157e · 879157e
2 parents 01bfc27 + 4640ff0
commit 879157e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 25 deletions.
diff --git a/src/main/java/com/owncloud/android/ui/activity/FileActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
@@ -844,6 +844,7 @@ private void onCreateShareViaLinkOperationFinish(CreateShareViaLinkOperation ope
      * @return A {@link FileDetailSharingFragment} instance, or null
      */
     private @Nullable
+    @Deprecated
     FileDetailSharingFragment getShareFileFragment() {
         Fragment fragment = getSupportFragmentManager().findFragmentByTag(ShareActivity.TAG_SHARE_FRAGMENT);
 

diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -812,6 +812,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
                         second != null && second.getFile() != null ||
                         isSearchOpen()) {
                     onBackPressed();
+                } else if (getLeftFragment() instanceof FileDetailFragment) {
+                    onBackPressed();
                 } else {
                     openDrawer();
                 }
@@ -1571,18 +1573,10 @@ public void showDetails(OCFile file) {
     public void showDetails(OCFile file, int activeTab) {
         User currentUser = getUser().orElseThrow(RuntimeException::new);
         Fragment detailFragment = FileDetailFragment.newInstance(file, currentUser, activeTab);
-        setSecondFragment(detailFragment);
-
-        OCFileListFragment listOfFiles = getListOfFilesFragment();
-        if (listOfFiles != null) {
-            resetHeaderScrollingState();
-            showSortListGroup(false);
-            listOfFiles.setFabVisible(false);
-        }
+        setLeftFragment(detailFragment);
 
-        updateFragmentsVisibility(true);
         updateActionBarTitleAndHomeButton(file);
-        setFile(file);
+        mDrawerToggle.setDrawerIndicatorEnabled(false);
     }
 
     private void resetHeaderScrollingState() {
@@ -1818,21 +1812,6 @@ private void onMoveFileOperationFinish(MoveFileOperation operation,
         }
     }
 
-    /**
-     * Shortcut to get access to the {@link FileDetailFragment} instance, if any
-     *
-     * @return A {@link FileDetailFragment} instance, or null
-     */
-    private FileDetailFragment getShareFileFragment() {
-        Fragment fragment = getSupportFragmentManager().findFragmentByTag(TAG_SECOND_FRAGMENT);
-
-        if (fragment instanceof FileDetailFragment) {
-            return (FileDetailFragment) fragment;
-        } else {
-            return null;
-        }
-    }
-
     /**
      * Updates the view associated to the activity after the finish of an operation trying to copy a
      * file.