fix back press from file details

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

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

@@ -1161,53 +1161,71 @@ class FileDisplayActivity :
             this,
             object : OnBackPressedCallback(true) {
                 override fun handleOnBackPressed() {
-                    when {
-                        isSearchOpen() -> {
-                            isEnabled = false
-                            resetSearchAction()
-                        }
+                    handleBackPressImpl(before = {
+                        isEnabled = false
+                    }, after = {
+                        isEnabled = true
+                    })
+                }
+            }
+        )
+    }
 
-                        isDrawerOpen -> {
-                            isEnabled = false
-                            onBackPressedDispatcher.onBackPressed()
-                        }
+    private fun handleBackPressImpl(before: () -> Unit = {}, after: () -> Unit = {}) {
+        when {
+            isSearchOpen() -> {
+                before()
+                resetSearchAction()
+                after()
+            }
 
-                        leftFragment is OCFileListFragment -> {
-                            val fragment = leftFragment as OCFileListFragment
-
-                            when {
-                                // root
-                                isRoot(getCurrentDir()) -> {
-                                    if (fragment.shouldNavigateBackToAllFiles()) {
-                                        navigateToAllFiles()
-                                    } else {
-                                        finish()
-                                    }
-                                }
-
-                                // Normal folder navigation (go up) also works for shared tab
-                                else -> {
-                                    browseUp(fragment)
-                                }
-                            }
-                        }
+            isDrawerOpen -> {
+                before()
+                onBackPressedDispatcher.onBackPressed()
+                after()
+            }
 
-                        else -> {
-                            isEnabled = false
-                            popBack()
-                        }
-                    }
+            leftFragment is OCFileListFragment -> {
+                before()
+                handleOCFileListFragmentBackPress()
+                after()
+            }
+
+            else -> {
+                before()
+                popBack()
+                after()
+            }
+        }
+    }
+
+    private fun handleOCFileListFragmentBackPress() {
+        val fragment = leftFragment as OCFileListFragment
+
+        when {
+            // root
+            isRoot(getCurrentDir()) -> {
+                if (fragment.shouldNavigateBackToAllFiles()) {
+                    navigateToAllFiles()
+                } else {
+                    finish()
                 }
             }
-        )
+
+            // Normal folder navigation (go up) also works for shared tab
+            else -> {
+                browseUp(fragment)
+            }
+        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
         android.R.id.home -> {
             when {
                 shouldOpenDrawer() -> openDrawer()
-                isSearchOpen() -> resetSearchAction()
-                else -> onBackPressedDispatcher.onBackPressed()
+                else -> {
+                    handleBackPressImpl()
+                }
             }
             true
         }

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

@@ -253,12 +253,19 @@ public void onCreate(Bundle savedInstanceState) {
 
     @Override
     public void onResume() {
-        if (getActivity() == null) {
+        // Don't handle search events if we're coming back from back stack
+        // The fragment has already been properly restored in onCreate/onActivityCreated
+        if (mFile != null) {
+            super.onResume();
             return;
         }
 
-        Intent intent = getActivity().getIntent();
+        final var activity = getActivity();
+        if (activity == null) {
+            return;
+        }
 
+        final Intent intent = activity.getIntent();
         if (IntentExtensionsKt.getParcelableArgument(intent, SEARCH_EVENT, SearchEvent.class) != null) {
             searchEvent = IntentExtensionsKt.getParcelableArgument(intent, SEARCH_EVENT, SearchEvent.class);
         }