From 416ef8d6d72430240f48f72886c36ae0b004dfbb Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Tue, 20 Dec 2022 21:08:35 +0800
Subject: [PATCH] fixup! Remove unused fab

---
 .../java/com/hippo/ehviewer/ui/scene/FavoritesScene.java | 7 +++----
 .../com/hippo/ehviewer/ui/scene/GalleryListScene.java    | 9 +++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
index f300e4119..d5b186f64 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
@@ -136,15 +136,13 @@ public class FavoritesScene extends SearchBarScene implements
         @Override
         public void run() {
             if (mFabLayout != null) {
-                mFabLayout.setSecondaryFabVisibilityAt(0, true);
+                updateJumpFab(); // index: 0, 2
                 mFabLayout.setSecondaryFabVisibilityAt(1, true);
-                mFabLayout.setSecondaryFabVisibilityAt(2, true);
                 mFabLayout.setSecondaryFabVisibilityAt(3, false);
                 mFabLayout.setSecondaryFabVisibilityAt(4, false);
                 mFabLayout.setSecondaryFabVisibilityAt(5, false);
                 mFabLayout.setSecondaryFabVisibilityAt(6, false);
             }
-            updateJumpFab();
         }
     };
     private int mFavLocalCount = 0;
@@ -346,7 +344,8 @@ public class FavoritesScene extends SearchBarScene implements
     // Hide jump fab on local fav cat
     private void updateJumpFab() {
         if (mFabLayout != null && mUrlBuilder != null) {
-            mFabLayout.setSecondaryFabVisibilityAt(1, mUrlBuilder.getFavCat() != FavListUrlBuilder.FAV_CAT_LOCAL);
+            mFabLayout.setSecondaryFabVisibilityAt(0, mUrlBuilder.getFavCat() != FavListUrlBuilder.FAV_CAT_LOCAL);
+            mFabLayout.setSecondaryFabVisibilityAt(2, mUrlBuilder.getFavCat() != FavListUrlBuilder.FAV_CAT_LOCAL);
         }
     }
 
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index a24c162dd..8658c65f5 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -467,7 +467,7 @@ public final class GalleryListScene extends SearchBarScene
     private void onUpdateUrlBuilder() {
         ListUrlBuilder builder = mUrlBuilder;
         Resources resources = getResourcesOrNull();
-        if (resources == null || builder == null || mSearchLayout == null) {
+        if (resources == null || builder == null || mSearchLayout == null || mFabLayout == null) {
             return;
         }
 
@@ -541,6 +541,7 @@ public final class GalleryListScene extends SearchBarScene
         FastScroller fastScroller = mContentLayout.getFastScroller();
         mSearchLayout = (SearchLayout) ViewUtils.$$(mainLayout, R.id.search_layout);
         mFabLayout = (FabLayout) ViewUtils.$$(mainLayout, R.id.fab_layout);
+        AssertUtils.assertNotNull(container);
         mSearchFab = ViewUtils.$$(container, R.id.search_fab);
         ViewCompat.setWindowInsetsAnimationCallback(view, new WindowInsetsAnimationHelper(
                 WindowInsetsAnimationCompat.Callback.DISPATCH_MODE_STOP,
@@ -823,7 +824,7 @@ public final class GalleryListScene extends SearchBarScene
 
     private void showGoToDialog() {
         Context context = getContext();
-        if (null == context || null == mHelper) {
+        if (null == context || null == mHelper || null == mUrlBuilder) {
             return;
         }
 
@@ -1252,7 +1253,7 @@ public final class GalleryListScene extends SearchBarScene
 
 
     private void onGetGalleryListSuccess(GalleryListParser.Result result, int taskId) {
-        if (mHelper != null && mHelper.isCurrentTask(taskId)) {
+        if (mHelper != null && mHelper.isCurrentTask(taskId) && mUrlBuilder != null) {
             String emptyString = getString(mUrlBuilder.getMode() == ListUrlBuilder.MODE_SUBSCRIPTION && result.noWatchedTags
                     ? R.string.gallery_list_empty_hit_subscription
                     : R.string.gallery_list_empty_hit);
@@ -1591,7 +1592,7 @@ public final class GalleryListScene extends SearchBarScene
         protected void getPageData(int taskId, int type, int page) {
             pgCounter = page;
             MainActivity activity = getMainActivity();
-            if (null == activity || null == mClient || null == mUrlBuilder) {
+            if (null == activity || null == mClient || null == mHelper || null == mUrlBuilder) {
                 return;
             }