Merge pull request #13624 from nextcloud/simplify-on-back-pressed-logic

Simplify FileDisplayActivity onBackPressed
nextcloud · Oct 7, 2024 · ff3a3bf · ff3a3bf
2 parents 05ed5fe + b057344
commit ff3a3bf
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1019,24 +1019,22 @@ private Boolean isRootDirectory() {
     @SuppressFBWarnings("ITC_INHERITANCE_TYPE_CHECKING")
     @Override
     public void onBackPressed() {
-        final boolean isDrawerOpen = isDrawerOpen();
-        final boolean isSearchOpen = isSearchOpen();
-
-        final Fragment leftFragment = getLeftFragment();
-
-        if (isSearchOpen) {
+        if (isSearchOpen()) {
             resetSearchAction();
-        } else if (isDrawerOpen) {
+            return;
+        }
+
+        if (isDrawerOpen()) {
             super.onBackPressed();
-        } else if (leftFragment instanceof OCFileListFragment listOfFiles) {
+            return;
+        }
 
-            // all closed
-            OCFile currentDir = getCurrentDir();
-            if (isRoot(currentDir)) {
+        if (getLeftFragment() instanceof OCFileListFragment listOfFiles) {
+            if (isRoot(getCurrentDir())) {
                 finish();
-                return;
+            } else {
+                browseUp(listOfFiles);
             }
-            browseUp(listOfFiles);
         } else {
             popBack();
         }