From 6c2989a4d3cf35613cd81d4fa652e74e4454c43f Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 9 Mar 2023 11:32:37 +0800
Subject: [PATCH] Fix add favourites

---
 .../java/com/hippo/ehviewer/ui/CommonOperations.kt | 14 +++++++-------
 .../hippo/ehviewer/ui/scene/GalleryDetailScene.kt  |  4 ++--
 .../hippo/ehviewer/ui/scene/GalleryListScene.kt    |  8 ++++----
 .../com/hippo/ehviewer/ui/scene/HistoryScene.kt    |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
index 1e802e52e..b3e9dc793 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
@@ -41,12 +41,12 @@ import com.hippo.ehviewer.download.DownloadManager as downloadManager
 object CommonOperations {
     private fun doAddToFavorites(
         activity: Activity, galleryInfo: GalleryInfo,
-        slot: Int, listener: EhClient.Callback<Void?>
+        slot: Int, listener: EhClient.Callback<Unit>
     ) {
         when (slot) {
             -1 -> {
                 EhDB.putLocalFavorites(galleryInfo)
-                listener.onSuccess(null)
+                listener.onSuccess(Unit)
             }
 
             in 0..9 -> {
@@ -66,7 +66,7 @@ object CommonOperations {
     @JvmOverloads
     fun addToFavorites(
         activity: Activity, galleryInfo: GalleryInfo,
-        listener: EhClient.Callback<Void?>, select: Boolean = false
+        listener: EhClient.Callback<Unit>, select: Boolean = false
     ) {
         val slot = Settings.defaultFavSlot
         val localFav = activity.getString(R.string.local_favorites)
@@ -106,7 +106,7 @@ object CommonOperations {
 
     fun removeFromFavorites(
         activity: Activity?, galleryInfo: GalleryInfo,
-        listener: EhClient.Callback<Void?>
+        listener: EhClient.Callback<Unit>
     ) {
         EhDB.removeLocalFavorites(galleryInfo.gid)
         val request = EhRequest()
@@ -249,10 +249,10 @@ object CommonOperations {
     }
 
     private class DelegateFavoriteCallback(
-        private val delegate: EhClient.Callback<Void?>, private val info: GalleryInfo,
+        private val delegate: EhClient.Callback<Unit>, private val info: GalleryInfo,
         private val newFavoriteName: String?, private val slot: Int
-    ) : EhClient.Callback<Void?> {
-        override fun onSuccess(result: Void?) {
+    ) : EhClient.Callback<Unit> {
+        override fun onSuccess(result: Unit) {
             info.favoriteName = newFavoriteName
             info.favoriteSlot = slot
             delegate.onSuccess(result)
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
index 8456fc900..1f10daabc 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
@@ -1413,8 +1413,8 @@ class GalleryDetailScene : CollapsingToolbarScene(), View.OnClickListener, Downl
         context: Context,
         private val mAddOrRemove: Boolean
     ) :
-        EhCallback<GalleryDetailScene?, Void?>(context) {
-        override fun onSuccess(result: Void?) {
+        EhCallback<GalleryDetailScene?, Unit>(context) {
+        override fun onSuccess(result: Unit) {
             showTip(
                 if (mAddOrRemove) R.string.remove_from_favorite_success else R.string.add_to_favorite_success,
                 LENGTH_SHORT
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
index 63b684afe..911588b36 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
@@ -1088,8 +1088,8 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
     }
 
     private class AddToFavoriteListener(context: Context) :
-        EhCallback<GalleryListScene, Void?>(context) {
-        override fun onSuccess(result: Void?) {
+        EhCallback<GalleryListScene, Unit>(context) {
+        override fun onSuccess(result: Unit) {
             showTip(R.string.add_to_favorite_success, LENGTH_SHORT)
         }
 
@@ -1101,8 +1101,8 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
     }
 
     private class RemoveFromFavoriteListener(context: Context) :
-        EhCallback<GalleryListScene, Void?>(context) {
-        override fun onSuccess(result: Void?) {
+        EhCallback<GalleryListScene, Unit>(context) {
+        override fun onSuccess(result: Unit) {
             showTip(R.string.remove_from_favorite_success, LENGTH_SHORT)
         }
 
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
index 5b1dbccda..fba1afe62 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
@@ -321,8 +321,8 @@ class HistoryScene : BaseToolbarScene() {
     }
 
     private class AddToFavoriteListener(context: Context) :
-        EhCallback<GalleryListScene?, Void?>(context) {
-        override fun onSuccess(result: Void?) {
+        EhCallback<GalleryListScene?, Unit>(context) {
+        override fun onSuccess(result: Unit) {
             showTip(R.string.add_to_favorite_success, LENGTH_SHORT)
         }
 
@@ -334,8 +334,8 @@ class HistoryScene : BaseToolbarScene() {
     }
 
     private class RemoveFromFavoriteListener(context: Context) :
-        EhCallback<GalleryListScene?, Void?>(context) {
-        override fun onSuccess(result: Void?) {
+        EhCallback<GalleryListScene?, Unit>(context) {
+        override fun onSuccess(result: Unit) {
             showTip(R.string.remove_from_favorite_success, LENGTH_SHORT)
         }