Remove gallery from local favourites in CommonOperations.removeFromFavorites()

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

@@ -239,6 +239,7 @@ public final class CommonOperations {
 
     public static void removeFromFavorites(Activity activity, GalleryInfo galleryInfo,
             final EhClient.Callback<Void> listener) {
+        EhDB.removeLocalFavorites(galleryInfo.gid);
         EhClient client = EhApplication.getEhClient(activity);
         EhRequest request = new EhRequest();
         request.setMethod(EhClient.METHOD_ADD_FAVORITES);

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

@@ -1209,11 +1209,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
         } else if (mHeartGroup == v) {
             if (mGalleryDetail != null && !mModifingFavorites) {
                 boolean remove = false;
-                if (EhDB.containLocalFavorites(mGalleryDetail.gid)) {
-                    EhDB.removeLocalFavorites(mGalleryDetail.gid);
-                    remove = true;
-                }
-                if (mGalleryDetail.isFavorited) {
+                if (EhDB.containLocalFavorites(mGalleryDetail.gid) || mGalleryDetail.isFavorited) {
                     mModifingFavorites = true;
                     CommonOperations.removeFromFavorites(activity, mGalleryDetail,
                             new ModifyFavoritesListener(context,