only refresh the data if really needed

Piwigo · Oct 17, 2019 · 548ae98 · 548ae98
1 parent 1112f23
commit 548ae98
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/app/src/main/java/org/piwigo/ui/main/AlbumsViewModel.java b/app/src/main/java/org/piwigo/ui/main/AlbumsViewModel.java
@@ -84,9 +84,7 @@ public Integer getCategory() {
         return category;
     }
 
-    void loadAlbums(Integer categoryId) {
-        category = categoryId;
-
+    private void forcedLoadAlbums(){
         Account account = userManager.getActiveAccount().getValue();
         if (albumsSubscription != null) {
             // cleanup, just in case
@@ -99,16 +97,23 @@ void loadAlbums(Integer categoryId) {
             photosSubscription = null;
         }
         if (account != null) {
-            albumsSubscription = categoriesRepository.getCategories(account, categoryId)
+            albumsSubscription = categoriesRepository.getCategories(account, category)
                     .subscribe(new CategoriesSubscriber());
-            photosSubscription = imageRepository.getImages(account, categoryId)
+            photosSubscription = imageRepository.getImages(account, category)
                     .subscribe(new ImagesSubscriber());
         }
     }
 
+    void loadAlbums(Integer categoryId) {
+        if(category == null || category != category) {
+            category = categoryId;
+            forcedLoadAlbums();
+        }
+    }
+
     public void onRefresh() {
         isLoading.set(true);
-        loadAlbums(getCategory());
+        forcedLoadAlbums();
     }
 
     private class CategoriesSubscriber extends Subscriber<List<Category>> {