From db16a0c17c03ac17a66584e06a7961a52d502519 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Fri, 2 Jun 2023 15:20:41 +0800
Subject: [PATCH] Cleanup Settings

---
 .../main/java/com/hippo/ehviewer/Settings.kt  | 26 ++++---------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.kt b/app/src/main/java/com/hippo/ehviewer/Settings.kt
index 2d4363c6f..a0214ca8b 100755
--- a/app/src/main/java/com/hippo/ehviewer/Settings.kt
+++ b/app/src/main/java/com/hippo/ehviewer/Settings.kt
@@ -2,11 +2,9 @@
 
 package com.hippo.ehviewer
 
-import android.content.SharedPreferences
 import android.net.Uri
 import android.util.Log
 import androidx.annotation.DimenRes
-import androidx.preference.PreferenceManager
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.unifile.UniFile
 import splitties.init.appCtx
@@ -58,32 +56,18 @@ object Settings : DefaultPreferences() {
     private val TAG = Settings::class.java.simpleName
     private const val KEY_LAUNCH_PAGE = "launch_page"
     private const val DEFAULT_LAUNCH_PAGE = 0
-    private lateinit var sSettingsPre: SharedPreferences
 
     fun initialize() {
-        sSettingsPre = PreferenceManager.getDefaultSharedPreferences(appCtx)
-        fixDefaultValue()
-    }
-
-    private fun fixDefaultValue() {
         if ("CN" == Locale.getDefault().country) {
-            // Enable domain fronting if the country is CN
-            if (!sSettingsPre.contains(KEY_BUILT_IN_HOSTS)) {
-                builtInHosts = true
-            }
-            if (!sSettingsPre.contains(KEY_DOMAIN_FRONTING)) {
-                dF = true
-            }
-            // Enable show tag translations if the country is CN
-            if (!sSettingsPre.contains(KEY_SHOW_TAG_TRANSLATIONS)) {
-                showTagTranslations = true
-            }
+            if (KEY_BUILT_IN_HOSTS !in prefs) builtInHosts = true
+            if (KEY_DOMAIN_FRONTING !in prefs) dF = true
+            if (KEY_SHOW_TAG_TRANSLATIONS !in prefs) showTagTranslations = true
         }
     }
 
     private fun getString(key: String, defValue: String?): String? {
         return try {
-            sSettingsPre.getString(key, defValue)
+            prefs.getString(key, defValue)
         } catch (e: ClassCastException) {
             Log.d(TAG, "Get ClassCastException when get $key value", e)
             defValue
@@ -91,7 +75,7 @@ object Settings : DefaultPreferences() {
     }
 
     private fun putString(key: String, value: String?) {
-        sSettingsPre.edit().putString(key, value).apply()
+        prefs.edit().putString(key, value).apply()
     }
 
     @get:DimenRes