From b195277c9a2323bacfe16e27e58c7a9f700e161a Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Fri, 6 Jan 2023 11:32:53 +0800
Subject: [PATCH] Minor Refactor

---
 .../ehviewer/client/data/ListUrlBuilder.kt    | 30 ++++---------------
 .../ehviewer/ui/scene/GalleryListScene.java   |  2 +-
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt b/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt
index 5ef525916..b85de8133 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt
@@ -32,7 +32,7 @@ import java.io.UnsupportedEncodingException
 import java.net.URLDecoder
 
 @Parcelize
-open class ListUrlBuilder(
+data class ListUrlBuilder(
     @get:Mode @Mode var mode: Int = MODE_NORMAL,
     private var mPrev: String? = null,
     private var mNext: String? = null,
@@ -48,7 +48,7 @@ open class ListUrlBuilder(
     var isUseSimilarityScan: Boolean = false,
     var isOnlySearchCovers: Boolean = false,
     var isShowExpunged: Boolean = false,
-) : Cloneable, Parcelable {
+) : Parcelable {
 
     fun reset() {
         mode = MODE_NORMAL
@@ -68,6 +68,9 @@ open class ListUrlBuilder(
         mSHash = null
     }
 
+    // Temp for Java compatibility
+    fun copyJ() : ListUrlBuilder = this.copy()
+
     fun setIndex(index: String?, isNext: Boolean = true) {
         mNext = index?.takeIf { isNext }
         mPrev = index?.takeUnless { isNext }
@@ -83,29 +86,6 @@ open class ListUrlBuilder(
             mKeyword = keyword
         }
 
-    /**
-     * Make them the same
-     *
-     * @param lub The template
-     */
-    fun set(lub: ListUrlBuilder) {
-        mode = lub.mode
-        mPrev = lub.mPrev
-        mNext = lub.mNext
-        mJumpTo = lub.mJumpTo
-        this.category = lub.category
-        mKeyword = lub.mKeyword
-        advanceSearch = lub.advanceSearch
-        minRating = lub.minRating
-        pageFrom = lub.pageFrom
-        pageTo = lub.pageTo
-        imagePath = lub.imagePath
-        isUseSimilarityScan = lub.isUseSimilarityScan
-        isOnlySearchCovers = lub.isOnlySearchCovers
-        isShowExpunged = lub.isShowExpunged
-        mSHash = lub.mSHash
-    }
-
     fun set(q: QuickSearch) {
         mode = q.mode
         this.category = q.category
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 a9aa9d3c4..9472c5adc 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
@@ -298,7 +298,7 @@ public final class GalleryListScene extends SearchBarScene
         } else if (ACTION_LIST_URL_BUILDER.equals(action)) {
             ListUrlBuilder builder = args.getParcelable(KEY_LIST_URL_BUILDER);
             if (builder != null) {
-                mUrlBuilder.set(builder);
+                mUrlBuilder = builder.copyJ();
             }
         }
     }