From 1a01caee2cb11d9e8e291b20f236842634cba170 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 1 Jun 2023 18:48:33 +0800
Subject: [PATCH] Cleanup archivePasswds pref

---
 .../main/java/com/hippo/ehviewer/Settings.kt    | 17 ++---------------
 .../hippo/ehviewer/gallery/ArchivePageLoader.kt |  1 +
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.kt b/app/src/main/java/com/hippo/ehviewer/Settings.kt
index 5b20c28de..a93e70ec8 100755
--- a/app/src/main/java/com/hippo/ehviewer/Settings.kt
+++ b/app/src/main/java/com/hippo/ehviewer/Settings.kt
@@ -178,18 +178,6 @@ object Settings : DefaultPreferences() {
         sSettingsPre.edit().putString(key, value).apply()
     }
 
-    private fun getStringSet(key: String): MutableSet<String>? {
-        return sSettingsPre.getStringSet(key, null)
-    }
-
-    private fun putStringToStringSet(key: String, value: String) {
-        var set = getStringSet(key)
-        if (set == null) {
-            set = mutableSetOf(value)
-        } else if (set.contains(value)) return else set.add(value)
-        sSettingsPre.edit().putStringSet(key, set).apply()
-    }
-
     private fun getIntFromStr(key: String, defValue: Int): Int {
         return try {
             NumberUtils.parseIntSafely(
@@ -337,11 +325,10 @@ object Settings : DefaultPreferences() {
     val readCacheSize: Int
         get() = getIntFromStr(KEY_READ_CACHE_SIZE, DEFAULT_READ_CACHE_SIZE)
 
-    val archivePasswds: Set<String>?
-        get() = getStringSet(KEY_ARCHIVE_PASSWDS)
+    var archivePasswds by stringSetOrNullPref(KEY_ARCHIVE_PASSWDS)
 
     fun putPasswdToArchivePasswds(value: String) {
-        putStringToStringSet(KEY_ARCHIVE_PASSWDS, value)
+        archivePasswds = archivePasswds?.toMutableSet()?.apply { add(value) } ?: setOf(value)
     }
 
     private val _listThumbSize by intPref(KEY_LIST_THUMB_SIZE, 40)
diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt b/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt
index 6cc3bfa1b..148959642 100644
--- a/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt
+++ b/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt
@@ -52,6 +52,7 @@ class ArchivePageLoader(context: Context, private val uri: Uri, passwdFlow: Flow
         }
         if (needPassword()) {
             Settings.archivePasswds?.forEach {
+                it ?: return@forEach
                 if (providePassword(it)) return@launch
             }
             passwdFlow.collect {