call same method to configure next view

Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>

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

@@ -624,7 +624,8 @@ public class FileDisplayActivity extends FileActivity
         transaction.replace(R.id.left_fragment_container, fragment, TAG_LIST_OF_FILES);
         transaction.commit();
 
-        if (fragment instanceof UnifiedSearchFragment || fragment instanceof PreviewMediaFragment) {
+        if (fragment instanceof UnifiedSearchFragment || fragment instanceof PreviewMediaFragment || fragment instanceof PreviewTextFileFragment
+            || fragment instanceof PreviewTextStringFragment) {
             showSortListGroup(false);
         } else {
             showSortListGroup(true);
@@ -812,19 +813,10 @@ public class FileDisplayActivity extends FileActivity
         int itemId = item.getItemId();
 
         if (itemId == android.R.id.home) {
-            OCFile currentDir = getCurrentDir();
-            if (isDrawerOpen()) {
-                closeDrawer();
-            } else if (
-                currentDir != null && currentDir.getParentId() != 0 ||
-                    isSearchOpen()) {
-                onBackPressed();
-            } else if (getLeftFragment() instanceof FileDetailFragment ||
-                getLeftFragment() instanceof PreviewMediaFragment ||
-                getLeftFragment() instanceof UnifiedSearchFragment || getLeftFragment() instanceof PreviewPdfFragment) {
-                onBackPressed();
-            } else {
+            if (!isDrawerOpen() && !isSearchOpen() && isRoot(getCurrentDir()) && getLeftFragment() instanceof OCFileListFragment) {
                 openDrawer();
+            } else {
+                onBackPressed();
             }
         } else if (itemId == R.id.action_select_all) {
             OCFileListFragment fragment = getListOfFilesFragment();
@@ -885,7 +877,7 @@ public class FileDisplayActivity extends FileActivity
                                                            FileUploader.LOCAL_BEHAVIOUR_DELETE);
                     }
                 }
-            }, new String[] { FileOperationsHelper.createImageFile(getActivity()).getAbsolutePath() }).execute();
+            }, new String[]{FileOperationsHelper.createImageFile(getActivity()).getAbsolutePath()}).execute();
         } else if (requestCode == REQUEST_CODE__MOVE_OR_COPY_FILES && resultCode == RESULT_OK) {
             exitSelectionMode();
         } else if (requestCode == PermissionUtil.REQUEST_CODE_MANAGE_ALL_FILES) {
@@ -1018,48 +1010,59 @@ public class FileDisplayActivity extends FileActivity
 
         final Fragment leftFragment = getLeftFragment();
 
-        if (leftFragment instanceof OCFileListFragment) {
+        if (isSearchOpen) {
+            resetSearchAction();
+        } else if (isDrawerOpen) {
+            super.onBackPressed();
+        } else if (leftFragment instanceof OCFileListFragment) {
             OCFileListFragment listOfFiles = (OCFileListFragment) leftFragment;
 
-            if (isSearchOpen && searchView != null) {
-                searchView.setQuery("", true);
-                searchView.onActionViewCollapsed();
-                searchView.clearFocus();
+            // all closed
+            OCFile currentDir = getCurrentDir();
+            if (isRoot(currentDir)) {
+                finish();
+                return;
+            }
+            browseUp(listOfFiles);
+        } else {
+            popBack();
+        }
+    }
 
-                // Remove the list to the original state
-                ArrayList<String> listOfHiddenFiles =  listOfFiles.getAdapter().listOfHiddenFiles;
-                listOfFiles.performSearch("", listOfHiddenFiles, true);
+    private void popBack() {
+        // pop back
+        resetScrolling(true);
+        showSortListGroup(true);
+        super.onBackPressed();
+    }
 
-                hideSearchView(getCurrentDir());
+    private void browseUp(OCFileListFragment listOfFiles) {
+        listOfFiles.onBrowseUp();
+        setFile(listOfFiles.getCurrentFile());
+        listOfFiles.setFabVisible(true);
+        listOfFiles.registerFabListener();
+        showSortListGroup(true);
+        resetTitleBarAndScrolling();
+        setDrawerAllFiles();
+    }
+
+    private void resetSearchAction() {
+        Fragment leftFragment = getLeftFragment();
+        if (isSearchOpen() && searchView != null) {
+            searchView.setQuery("", true);
+            searchView.onActionViewCollapsed();
+            searchView.clearFocus();
+
+            // Remove the list to the original state
+            ArrayList<String> listOfHiddenFiles = listOfFiles.getAdapter().listOfHiddenFiles;
+            listOfFiles.performSearch("", listOfHiddenFiles, true);
 
+            if (isRoot(getCurrentDir()) && leftFragment instanceof OCFileListFragment) {
+                hideSearchView(getCurrentDir());
                 setDrawerIndicatorEnabled(isDrawerIndicatorAvailable());
-            } else if (isDrawerOpen) {
-                // close drawer first
-                super.onBackPressed();
-            } else {
-                // all closed
-                OCFile currentDir = getCurrentDir();
-                if (currentDir == null || currentDir.getParentId() == FileDataStorageManager.ROOT_PARENT_ID) {
-                    finish();
-                    return;
-                }
-                listOfFiles.onBrowseUp();
-                setFile(listOfFiles.getCurrentFile());
-                listOfFiles.setFabVisible(true);
-                listOfFiles.registerFabListener();
-                showSortListGroup(true);
-                resetTitleBarAndScrolling();
-                setDrawerAllFiles();
             }
-        } else if (leftFragment instanceof PreviewTextStringFragment) {
-            createMinFragments(null);
-        } else if (leftFragment instanceof PreviewPdfFragment) {
-            super.onBackPressed();
-        } else {
-            // pop back
-            resetScrolling(true);
-            hideSearchView(getCurrentDir());
-            showSortListGroup(true);
+        }
+        if (leftFragment instanceof UnifiedSearchFragment) {
             super.onBackPressed();
         }
     }
@@ -1567,9 +1570,9 @@ public class FileDisplayActivity extends FileActivity
 
         Fragment detailFragment = FileDetailFragment.newInstance(file, currentUser, activeTab);
         setLeftFragment(detailFragment);
-
-        updateActionBarTitleAndHomeButton(file);
-        mDrawerToggle.setDrawerIndicatorEnabled(false);
+        configureToolbarForPreview(file);
+//        updateActionBarTitleAndHomeButton(file);
+//        mDrawerToggle.setDrawerIndicatorEnabled(false);
     }
 
     /**
@@ -2151,7 +2154,7 @@ public class FileDisplayActivity extends FileActivity
             return; // not reachable under normal conditions
         }
         if (showPreview && file.isDown() && !file.isDownloading() || streamMedia) {
-            configureToolbarForMediaPreview(file);
+            configureToolbarForPreview(file);
             Fragment mediaFragment = PreviewMediaFragment.newInstance(file, user.get(), startPlaybackPosition, autoplay, false);
             setLeftFragment(mediaFragment);
         } else {
@@ -2166,7 +2169,7 @@ public class FileDisplayActivity extends FileActivity
         }
     }
 
-    public void configureToolbarForMediaPreview(OCFile file) {
+    public void configureToolbarForPreview(OCFile file) {
         showSortListGroup(false);
         lockScrolling();
         super.updateActionBarTitleAndHomeButton(file);
@@ -2185,10 +2188,10 @@ public class FileDisplayActivity extends FileActivity
         }
         User user = optUser.get();
         if (showPreview) {
-            showSortListGroup(false);
+//            showSortListGroup(false);
             PreviewTextFileFragment fragment = PreviewTextFileFragment.create(user, file, searchOpen, searchQuery);
             setLeftFragment(fragment);
-            super.updateActionBarTitleAndHomeButton(file);
+            configureToolbarForPreview(file);
         } else {
             Intent previewIntent = new Intent();
             previewIntent.putExtra(EXTRA_FILE, file);
@@ -2206,14 +2209,15 @@ public class FileDisplayActivity extends FileActivity
      * @param folder {@link OCFile} to preview its rich workspace.
      */
     public void startRichWorkspacePreview(OCFile folder) {
-        showSortListGroup(false);
+//        showSortListGroup(false);
         Bundle args = new Bundle();
         args.putParcelable(EXTRA_FILE, folder);
+        configureToolbarForPreview(folder);
+        Log.d(Constant.LOG_TAG, "Rich Preview: " + folder);
         Fragment textPreviewFragment = Fragment.instantiate(getApplicationContext(),
                                                             PreviewTextStringFragment.class.getName(),
                                                             args);
         setLeftFragment(textPreviewFragment);
-        super.updateActionBarTitleAndHomeButton(folder);
     }
 
     public void startContactListFragment(OCFile file) {
@@ -2230,8 +2234,8 @@ public class FileDisplayActivity extends FileActivity
 
             setLeftFragment(pdfFragment);
 
-            updateActionBarTitleAndHomeButton(file);
-            showSortListGroup(false);
+//            showSortListGroup(false);
+            configureToolbarForPreview(file);
             mDrawerToggle.setDrawerIndicatorEnabled(false);
             setMainFabVisible(false);
         }
@@ -2249,9 +2253,9 @@ public class FileDisplayActivity extends FileActivity
         final User currentUser = getUser().orElseThrow(RuntimeException::new);
         Fragment detailFragment = FileDetailFragment.newInstance(file, parentFolder, currentUser);
         setLeftFragment(detailFragment);
+        configureToolbarForPreview(file);
         mWaitingToPreview = file;
         requestForDownload();
-        updateActionBarTitleAndHomeButton(file);
         setFile(file);
     }
 
@@ -2260,7 +2264,7 @@ public class FileDisplayActivity extends FileActivity
      * Opens EditImageActivity with given file loaded. If file is not available locally, it will be synced before
      * opening the image editor.
      *
-     * @param file      {@link OCFile} (image) to be loaded into image editor
+     * @param file {@link OCFile} (image) to be loaded into image editor
      */
     public void startImageEditor(OCFile file) {
         if (file.isDown()) {
@@ -2269,7 +2273,7 @@ public class FileDisplayActivity extends FileActivity
             startActivity(editImageIntent);
         } else {
             mWaitingToPreview = file;
-            requestForDownload(file,EditImageActivity.OPEN_IMAGE_EDITOR, getPackageName(),
+            requestForDownload(file, EditImageActivity.OPEN_IMAGE_EDITOR, getPackageName(),
                                this.getClass().getSimpleName());
             updateActionBarTitleAndHomeButton(file);
             setFile(file);
@@ -2618,4 +2622,5 @@ public class FileDisplayActivity extends FileActivity
             DisplayUtils.showSnackMessage(listOfFiles.getView(), message);
         }
     }
+
 }

app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java

@@ -73,7 +73,6 @@ import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.activity.DrawerActivity;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
@@ -101,8 +100,8 @@ import kotlin.jvm.functions.Function0;
 /**
  * This fragment shows a preview of a downloaded media file (audio or video).
  * <p>
- * Trying to get an instance with NULL {@link OCFile} or ownCloud {@link User} values will produce an {@link
- * IllegalStateException}.
+ * Trying to get an instance with NULL {@link OCFile} or ownCloud {@link User} values will produce an
+ * {@link IllegalStateException}.
  * <p>
  * By now, if the {@link OCFile} passed is not downloaded, an {@link IllegalStateException} is generated on
  * instantiation too.
@@ -116,7 +115,7 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
     public static final String EXTRA_USER = "USER";
     public static final String EXTRA_AUTOPLAY = "AUTOPLAY";
     public static final String EXTRA_START_POSITION = "START_POSITION";
-    
+
     private static final String EXTRA_PLAY_POSITION = "PLAY_POSITION";
     private static final String EXTRA_PLAYING = "PLAYING";
     private static final double MIN_DENSITY_RATIO = 24.0;
@@ -365,7 +364,7 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
                     Executors.newSingleThreadExecutor().execute(() -> {
                         try {
                             nextcloudClient = clientFactory.createNextcloudClient(accountManager.getUser());
-                            handler.post(() ->{
+                            handler.post(() -> {
                                 exoPlayer = NextcloudExoPlayer.createNextcloudExoplayer(requireContext(), nextcloudClient);
 
                                 exoPlayer.addListener(new ExoplayerListener(requireContext(), binding.exoplayerView, exoPlayer, () -> {
@@ -619,9 +618,6 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
     @Override
     public void onResume() {
         super.onResume();
-        if(getActivity() instanceof FileDisplayActivity){
-            ((FileDisplayActivity) getActivity()).configureToolbarForMediaPreview(getFile());
-        }
         Log_OC.v(TAG, "onResume");
     }