fix action bar press back from unified search fragment and when fda created or recreated

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

Author: alperozturk96

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

@@ -713,19 +713,6 @@ public void startPhotoSearch(int id) {
         launchActivityForSearch(searchEvent, id);
     }
 
-    private void handleSearchEvents(SearchEvent searchEvent, int menuItemId) {
-        if (this instanceof FileDisplayActivity) {
-            final Fragment leftFragment = ((FileDisplayActivity) this).getLeftFragment();
-            if (leftFragment instanceof GalleryFragment || leftFragment instanceof SharedListFragment) {
-                launchActivityForSearch(searchEvent, menuItemId);
-            } else {
-                EventBus.getDefault().post(searchEvent);
-            }
-        } else {
-            launchActivityForSearch(searchEvent, menuItemId);
-        }
-    }
-
     private void launchActivityForSearch(SearchEvent searchEvent, int menuItemId) {
         DrawerActivity.menuItemId = menuItemId;
         Intent intent = new Intent(getApplicationContext(), FileDisplayActivity.class);
@@ -1477,6 +1464,14 @@ public static boolean isToolbarStyleSearch() {
             menuItemId == R.id.nav_personal_files;
     }
 
+    public static boolean isMenuItemIdBelongsToSearchType() {
+        return menuItemId == R.id.nav_favorites ||
+            menuItemId == R.id.nav_shared ||
+            menuItemId == R.id.nav_on_device ||
+            menuItemId == R.id.nav_recently_modified ||
+            menuItemId == R.id.nav_gallery;
+    }
+
     public static int getPreviousMenuItemId() {
         return previousMenuItemId;
     }

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

@@ -307,6 +307,11 @@ class FileDisplayActivity :
         mSwitchAccountButton.setOnClickListener { v: View? -> showManageAccountsDialog() }
         mNotificationButton.setOnClickListener { v: View? -> startActivity(NotificationsActivity::class.java) }
         fastScrollUtils.fixAppBarForFastScroll(binding.appbar.appbar, binding.rootLayout)
+
+        // reset ui states when file display activity created/recrated
+        listOfFilesFragment?.resetSearchAttributes()
+        menuItemId = R.id.nav_all_files
+        setNavigationViewItemChecked()
     }
 
     private fun initTaskRetainerFragment() {

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

@@ -181,7 +181,17 @@ private OCFileDepth getCurrentDirDepth() {
     }
 
     private SearchType getSearchType() {
-        OCFileListFragment fragment = getOCFileListFragment();
+        final OCFileListFragment fragment = getOCFileListFragment();
+
+        // if current navigation not matches, reset search event
+        if (!DrawerActivity.isMenuItemIdBelongsToSearchType()) {
+            if (fragment != null) {
+                fragment.resetSearchAttributes();
+            }
+
+            return SearchType.NO_SEARCH;
+        }
+
         if (fragment != null) {
             return fragment.getCurrentSearchType();
         }

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

@@ -1784,7 +1784,7 @@ private void resetMenuItems() {
         updateSortAndGridMenuItems();
     }
 
-    private void resetSearchAttributes() {
+    public void resetSearchAttributes() {
         searchFragment = false;
         searchEvent = null;
         currentSearchType = NO_SEARCH;