Move the switch statement from the search method to the getFilteredMe…

…dia method and delete reloadMediaGrid from the Activity
wordpress-mobile · Mar 20, 2018 · c60d463 · c60d463
1 parent 28242f5
commit c60d463
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 25 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java
@@ -514,8 +514,6 @@ public boolean onMenuItemActionExpand(MenuItem item) {
             onQueryTextChange(mQuery);
         }
 
-        reloadMediaGrid();
-
         return true;
     }
 
@@ -526,8 +524,6 @@ public boolean onMenuItemActionCollapse(MenuItem item) {
 
         enableTabs(true);
 
-        reloadMediaGrid();
-
         return true;
     }
 

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java
@@ -350,7 +350,23 @@ private void ensureCorrectState(List<MediaModel> mediaModels) {
     List<MediaModel> getFilteredMedia() {
         List<MediaModel> mediaList;
         if (!TextUtils.isEmpty(mSearchTerm)) {
-            mediaList = mMediaStore.searchSiteMedia(mSite, mSearchTerm);
+            switch (mFilter) {
+                case FILTER_IMAGES:
+                    mediaList = mMediaStore.searchSiteImages(mSite, mSearchTerm);
+                    break;
+                case FILTER_DOCUMENTS:
+                    mediaList = mMediaStore.searchSiteDocuments(mSite, mSearchTerm);
+                    break;
+                case FILTER_VIDEOS:
+                    mediaList = mMediaStore.searchSiteVideos(mSite, mSearchTerm);
+                    break;
+                case FILTER_AUDIO:
+                    mediaList = mMediaStore.searchSiteAudio(mSite, mSearchTerm);
+                    break;
+                default:
+                    mediaList = mMediaStore.searchSiteMedia(mSite, mSearchTerm);
+                    break;
+            }
         } else if (mBrowserType.isSingleImagePicker()) {
             mediaList = mMediaStore.getSiteImages(mSite);
         } else if (mBrowserType.canFilter()) {
@@ -506,27 +522,8 @@ void removeMediaItem(@NonNull MediaModel media) {
     }
 
     public void search(String searchTerm) {
-        List<MediaModel> mediaList;
         mSearchTerm = searchTerm;
-
-        switch (mFilter) {
-            case FILTER_IMAGES:
-                mediaList = mMediaStore.searchSiteImages(mSite, mSearchTerm);
-                break;
-            case FILTER_DOCUMENTS:
-                mediaList = mMediaStore.searchSiteDocuments(mSite, mSearchTerm);
-                break;
-            case FILTER_VIDEOS:
-                mediaList = mMediaStore.searchSiteVideos(mSite, mSearchTerm);
-                break;
-            case FILTER_AUDIO:
-                mediaList = mMediaStore.searchSiteAudio(mSite, mSearchTerm);
-                break;
-            default:
-                mediaList = mMediaStore.searchSiteMedia(mSite, mSearchTerm);
-                break;
-        }
-
+        List<MediaModel> mediaList = getFilteredMedia();
         mGridAdapter.setMediaList(mediaList);
     }