Add FavouriteStatusRouter to forward the favourite status

app/src/main/java/com/hippo/ehviewer/EhApplication.java

@@ -92,6 +92,7 @@ public class EhApplication extends RecordingApplication {
     private SimpleDiskCache mSpiderInfoCache;
     private DownloadManager mDownloadManager;
     private Hosts mHosts;
+    private FavouriteStatusRouter mFavouriteStatusRouter;
 
     private final List<Activity> mActivityList = new ArrayList<>();
 
@@ -342,6 +343,12 @@ public class EhApplication extends RecordingApplication {
         if (application.mGalleryDetailCache == null) {
             // Max size 25, 3 min timeout
             application.mGalleryDetailCache = new LruCache<>(25);
+            application.mFavouriteStatusRouter.addListener((gid, slot) -> {
+                GalleryDetail gd = application.mGalleryDetailCache.get(gid);
+                if (gd != null) {
+                    gd.favoriteSlot = slot;
+                }
+            });
         }
         return application.mGalleryDetailCache;
     }
@@ -379,6 +386,20 @@ public class EhApplication extends RecordingApplication {
         return application.mHosts;
     }
 
+    @NonNull
+    public static FavouriteStatusRouter getFavouriteStatusRouter() {
+        return getFavouriteStatusRouter(getInstance());
+    }
+
+    @NonNull
+    public static FavouriteStatusRouter getFavouriteStatusRouter(@NonNull Context context) {
+        EhApplication application = ((EhApplication) context.getApplicationContext());
+        if (application.mFavouriteStatusRouter == null) {
+            application.mFavouriteStatusRouter = new FavouriteStatusRouter();
+        }
+        return application.mFavouriteStatusRouter;
+    }
+
     @NonNull
     public static String getDeveloperEmail() {
         return "ehviewersu$gmail.com".replace('$', '@');

app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2019 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FavouriteStatusRouter {
+
+  private List<Listener> listeners = new ArrayList<>();
+
+  public void modifyFavourites(long gid, int slot) {
+    for (Listener listener : listeners) {
+      listener.onModifyFavourites(gid, slot);
+    }
+  }
+
+  public void addListener(Listener listener) {
+    listeners.add(listener);
+  }
+
+  public void removeListener(Listener listener) {
+    listeners.remove(listener);
+  }
+
+  public interface Listener {
+    void onModifyFavourites(long gid, int slot);
+  }
+}

app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java

@@ -33,7 +33,6 @@ import com.hippo.ehviewer.Settings;
 import com.hippo.ehviewer.UrlOpener;
 import com.hippo.ehviewer.client.EhClient;
 import com.hippo.ehviewer.client.EhRequest;
-import com.hippo.ehviewer.client.data.GalleryDetail;
 import com.hippo.ehviewer.client.data.GalleryInfo;
 import com.hippo.ehviewer.dao.DownloadLabel;
 import com.hippo.ehviewer.download.DownloadManager;
@@ -219,17 +218,13 @@ public final class CommonOperations {
         System.arraycopy(favCat, 0, items, 1, 10);
         if (slot >= -1 && slot <= 9) {
             String newFavoriteName = slot >= 0 ? items[slot + 1] : null;
-            doAddToFavorites(activity, galleryInfo, slot, galleryInfo instanceof GalleryDetail
-                    ? new UpdateFavoriteNameCallback(listener, (GalleryDetail) galleryInfo, newFavoriteName)
-                    : listener);
+            doAddToFavorites(activity, galleryInfo, slot, new DelegateFavoriteCallback(listener, galleryInfo, newFavoriteName, slot));
         } else {
             new ListCheckBoxDialogBuilder(activity, items,
                     (builder, dialog, position) -> {
                         int slot1 = position - 1;
                         String newFavoriteName = (slot1 >= 0 && slot1 <= 9) ? items[slot1+1] : null;
-                        doAddToFavorites(activity, galleryInfo, slot1, galleryInfo instanceof GalleryDetail
-                                ? new UpdateFavoriteNameCallback(listener, (GalleryDetail) galleryInfo, newFavoriteName)
-                                : listener);
+                        doAddToFavorites(activity, galleryInfo, slot1, new DelegateFavoriteCallback(listener, galleryInfo, newFavoriteName, slot1));
                         if (builder.isChecked()) {
                             Settings.putDefaultFavSlot(slot1);
                         } else {
@@ -248,29 +243,31 @@ public final class CommonOperations {
         EhRequest request = new EhRequest();
         request.setMethod(EhClient.METHOD_ADD_FAVORITES);
         request.setArgs(galleryInfo.gid, galleryInfo.token, -1, "");
-        request.setCallback(galleryInfo instanceof GalleryDetail
-                ? new UpdateFavoriteNameCallback(listener, (GalleryDetail) galleryInfo, null)
-                : listener);
+        request.setCallback(new DelegateFavoriteCallback(listener, galleryInfo, null, -2));
         client.execute(request);
     }
 
-    private static class UpdateFavoriteNameCallback implements EhClient.Callback<Void> {
+    private static class DelegateFavoriteCallback implements EhClient.Callback<Void> {
 
         private final EhClient.Callback<Void> delegate;
-        private final GalleryDetail detail;
+        private final GalleryInfo info;
         private final String newFavoriteName;
+        private final int slot;
 
-        UpdateFavoriteNameCallback(EhClient.Callback<Void> delegate, GalleryDetail detail,
-                String newFavoriteName) {
+        DelegateFavoriteCallback(EhClient.Callback<Void> delegate, GalleryInfo info,
+                String newFavoriteName, int slot) {
             this.delegate = delegate;
-            this.detail = detail;
+            this.info = info;
             this.newFavoriteName = newFavoriteName;
+            this.slot = slot;
         }
 
         @Override
         public void onSuccess(Void result) {
-            detail.favoriteName = newFavoriteName;
+            info.favoriteName = newFavoriteName;
+            info.favoriteSlot = slot;
             delegate.onSuccess(result);
+            EhApplication.getFavouriteStatusRouter().modifyFavourites(info.gid, slot);
         }
 
         @Override

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java

@@ -309,6 +309,12 @@ public final class GalleryListScene extends BaseScene
             public void onUpdateLabels() { }
         });
 
+        EhApplication.getFavouriteStatusRouter(context).addListener((gid, slot) -> {
+            if (mAdapter != null) {
+                mAdapter.notifyDataSetChanged();
+            }
+        });
+
         if (savedInstanceState == null) {
             onInit();
         } else {