Filter files according to the selected menu item

Signed-off-by: alperozturk <[email protected]>
nextcloud · Sep 5, 2024 · 23b534d · 23b534d
1 parent 48c9add
commit 23b534d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -200,6 +200,8 @@ public abstract class DrawerActivity extends ToolbarActivity
     @Inject
     ClientFactory clientFactory;
 
+    public int menuItemId = -1;
+
     /**
      * Initializes the drawer, its content and highlights the menu item with the given id. This method needs to be
      * called after the content view has been set.
@@ -487,6 +489,7 @@ public void onMessageEvent(DummyDrawerEvent event) {
     }
 
     private void onNavigationItemClicked(final MenuItem menuItem) {
+        menuItemId = menuItem.getItemId();
         setDrawerMenuItemChecked(menuItem.getItemId());
 
         int itemId = menuItem.getItemId();
@@ -517,8 +520,7 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
 
             closeDrawer();
         } else if (itemId == R.id.nav_favorites) {
-            handleSearchEvents(new SearchEvent("", SearchRemoteOperation.SearchType.FAVORITE_SEARCH),
-                               menuItem.getItemId());
+            filterFavoritesFiles(menuItem.getItemId());
         } else if (itemId == R.id.nav_gallery) {
             startPhotoSearch(menuItem.getItemId());
         } else if (itemId == R.id.nav_on_device) {
@@ -545,7 +547,7 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
                 UserInfoActivity.openAccountRemovalDialog(optionalUser.get(), getSupportFragmentManager());
             }
         } else if (itemId == R.id.nav_shared) {
-            startSharedSearch(menuItem);
+            startSharedSearch(menuItem.getItemId());
         } else if (itemId == R.id.nav_recently_modified) {
             startRecentlyModifiedSearch(menuItem);
         } else if (itemId == R.id.nav_assistant) {
@@ -568,6 +570,10 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
         }
     }
 
+    public void filterFavoritesFiles(int menuItemId) {
+        handleSearchEvents(new SearchEvent("", SearchRemoteOperation.SearchType.FAVORITE_SEARCH), menuItemId);
+    }
+
     private void startComposeActivity(ComposeDestination destination, int titleId, int menuItemId) {
         Intent composeActivity = new Intent(getApplicationContext(), ComposeActivity.class);
         composeActivity.putExtra(ComposeActivity.DESTINATION, destination);
@@ -609,11 +615,11 @@ public void openAddAccount() {
         }
     }
 
-    private void startSharedSearch(MenuItem menuItem) {
+    public void startSharedSearch(int menuItemId) {
         SearchEvent searchEvent = new SearchEvent("", SearchRemoteOperation.SearchType.SHARED_FILTER);
         MainApp.showOnlyFilesOnDevice(false);
 
-        launchActivityForSearch(searchEvent, menuItem.getItemId());
+        launchActivityForSearch(searchEvent, menuItemId);
     }
 
     private void startRecentlyModifiedSearch(MenuItem menuItem) {
@@ -630,7 +636,7 @@ public void startPhotoSearch(int id) {
         launchActivityForSearch(searchEvent, id);
     }
 
-    private void handleSearchEvents(SearchEvent searchEvent, int menuItemId) {
+    public void handleSearchEvents(SearchEvent searchEvent, int menuItemId) {
         if (this instanceof FileDisplayActivity) {
             final Fragment leftFragment = ((FileDisplayActivity) this).getLeftFragment();
             if (leftFragment instanceof GalleryFragment || leftFragment instanceof SharedListFragment) {

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
@@ -231,7 +231,6 @@ public class FileDisplayActivity extends FileActivity
     private SearchView searchView;
     private PlayerServiceConnection mPlayerConnection;
     private Optional<User> lastDisplayedUser = Optional.empty();
-    private int menuItemId = -1;
 
     @Inject AppPreferences preferences;
 
@@ -1024,11 +1023,20 @@ public void onBackPressed() {
                 return;
             }
             browseUp(listOfFiles);
+            filterCurrentDirectory();
         } else {
             popBack();
         }
     }
 
+    private void filterCurrentDirectory() {
+        if (menuItemId == R.id.nav_favorites) {
+            filterFavoritesFiles(menuItemId);
+        } else if (menuItemId == R.id.nav_shared) {
+            startSharedSearch(menuItemId);
+        }
+    }
+
     private void browseUp(OCFileListFragment listOfFiles) {
         listOfFiles.onBrowseUp();
         setFile(listOfFiles.getCurrentFile());