use Preferences functions from utils (#7757)

* import all temporarily

* use `getPreferencesLazy()`

regex: lazy\s*\{\s*Injekt\.get<Application>\(\)\.getSharedPreferences\(\"source_\$id\"\, 0x0000\)(!!)?\s*\}

* use `getPreferences()`

regex: Injekt\.get<Application>\(\)\.getSharedPreferences\(\"source_\$id\"\, 0x0000\)(!!)?

* `getPreferences` and `getPreferencesLazy` with migration

regex to find: getPreferences\(\)\s*\.

* preferences edge cases

* run lint

* why kotlinter not add newline

* bruh

* bump

* unused import not caught by kotlinter

* review suggestions on all files

* bump after merge main

* review

* reduce usage of

lib-multisrc/bakkin/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 6
+baseVersionCode = 7

lib-multisrc/bakkin/src/eu/kanade/tachiyomi/multisrc/bakkin/BakkinReaderX.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.multisrc.bakkin
 
-import android.app.Application
 import android.os.Build
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
@@ -14,6 +13,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.jsonObject
@@ -33,9 +33,7 @@ abstract class BakkinReaderX(
         "Android ${Build.VERSION.RELEASE}; Mobile) " +
         "Tachiyomi/${AppInfo.getVersionName()}"
 
-    protected val preferences by lazy {
+    protected val preferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)!!
-    }
 
     private val json by lazy { Injekt.get<Json>() }
 

lib-multisrc/colamanga/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 7
+baseVersionCode = 8
 
 dependencies {
     api(project(":lib:synchrony"))

lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaManga.kt

@@ -19,6 +19,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
@@ -46,9 +47,7 @@ abstract class ColaManga(
 
     private val intl = ColaMangaIntl(lang)
 
-    private val preferences by lazy {
+    private val preferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override val client = network.cloudflareClient.newBuilder()
         .rateLimitHost(

lib-multisrc/foolslide/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 3
+baseVersionCode = 4

lib-multisrc/foolslide/src/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.multisrc.foolslide
 
-import android.app.Application
 import androidx.preference.CheckBoxPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.network.GET
@@ -12,6 +11,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
@@ -273,9 +273,7 @@ abstract class FoolSlide(
 
     override fun imageUrlParse(document: Document) = throw UnsupportedOperationException()
 
-    protected val preferences by lazy {
+    protected val preferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)!!
-    }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         CheckBoxPreference(screen.context).apply {

lib-multisrc/galleryadults/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 4
+baseVersionCode = 5

lib-multisrc/galleryadults/src/eu/kanade/tachiyomi/multisrc/galleryadults/GalleryAdults.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.multisrc.galleryadults
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.util.Log
 import androidx.preference.PreferenceScreen
@@ -18,6 +17,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -36,8 +36,6 @@ import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 
@@ -56,9 +54,7 @@ abstract class GalleryAdults(
         .build()
 
     /* Preferences */
-    protected val preferences: SharedPreferences by lazy {
+    protected val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     protected open val useShortTitlePreference = true
 

lib-multisrc/grouple/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 30
+baseVersionCode = 31

lib-multisrc/grouple/src/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.multisrc.grouple
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.widget.Toast
 import eu.kanade.tachiyomi.network.GET
@@ -14,6 +13,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
@@ -22,8 +22,6 @@ import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.io.IOException
 import java.text.DecimalFormat
 import java.text.ParseException
@@ -37,9 +35,7 @@ abstract class GroupLe(
     final override val lang: String,
 ) : ConfigurableSource, ParsedHttpSource() {
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override val supportsLatest = true
 

lib-multisrc/guya/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 5
+baseVersionCode = 6

lib-multisrc/guya/src/eu/kanade/tachiyomi/multisrc/guya/Guya.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.multisrc.guya
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.os.Build
 import androidx.preference.ListPreference
@@ -16,6 +15,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import okhttp3.Headers
 import okhttp3.Request
 import okhttp3.Response
@@ -25,8 +25,6 @@ import org.jsoup.Jsoup
 import org.jsoup.select.Evaluator
 import rx.Observable
 import rx.schedulers.Schedulers
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 
 abstract class Guya(
     override val name: String,
@@ -48,9 +46,7 @@ abstract class Guya(
     private val scanlators: ScanlatorStore = ScanlatorStore()
 
     // Preferences configuration
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     // Request builder for the "browse" page of the manga
     override fun popularMangaRequest(page: Int): Request {

lib-multisrc/heancms/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 28
+baseVersionCode = 29
 
 dependencies {
     api(project(":lib:i18n"))

lib-multisrc/heancms/src/eu/kanade/tachiyomi/multisrc/heancms/HeanCms.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.multisrc.heancms
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.EditTextPreference
 import androidx.preference.PreferenceScreen
@@ -16,6 +15,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -26,8 +26,6 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Locale
 import kotlin.concurrent.thread
@@ -39,9 +37,7 @@ abstract class HeanCms(
     protected val apiUrl: String = baseUrl.replace("://", "://api."),
 ) : ConfigurableSource, HttpSource() {
 
-    protected val preferences: SharedPreferences by lazy {
+    protected val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override val supportsLatest = true
 

lib-multisrc/hentaihand/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 2
+baseVersionCode = 3

lib-multisrc/hentaihand/src/eu/kanade/tachiyomi/multisrc/hentaihand/HentaiHand.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.multisrc.hentaihand
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.text.InputType
 import android.widget.Toast
@@ -16,6 +15,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject
@@ -32,8 +32,6 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import rx.Observable
 import rx.schedulers.Schedulers
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.io.IOException
 import java.text.SimpleDateFormat
@@ -318,9 +316,7 @@ abstract class HentaiHand(
 
     // Preferences
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         screen.addPreference(screen.editTextPreference(USERNAME_TITLE, USERNAME_DEFAULT, username))

lib-multisrc/kemono/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 18
+baseVersionCode = 19

lib-multisrc/kemono/src/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.multisrc.kemono
 
-import android.app.Application
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
@@ -15,13 +14,12 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferences
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
 import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.lang.Thread.sleep
 import java.util.TimeZone
@@ -41,8 +39,7 @@ open class Kemono(
 
     private val json: Json by injectLazy()
 
-    private val preferences =
+    private val preferences = getPreferences()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
 
     private val apiPath = "api/v1"
 

lib-multisrc/keyoapp/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 13
+baseVersionCode = 14
 
 dependencies {
     api(project(":lib:i18n"))

lib-multisrc/keyoapp/src/eu/kanade/tachiyomi/multisrc/keyoapp/Keyoapp.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.multisrc.keyoapp
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
@@ -15,6 +14,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -23,8 +23,6 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.text.ParseException
 import java.text.SimpleDateFormat
@@ -37,9 +35,7 @@ abstract class Keyoapp(
     final override val lang: String,
 ) : ParsedHttpSource(), ConfigurableSource {
 
-    protected val preferences: SharedPreferences by lazy {
+    protected val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override val supportsLatest = true
 

lib-multisrc/libgroup/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 35
+baseVersionCode = 36

lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt

@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.multisrc.libgroup
 
 import android.annotation.SuppressLint
 import android.app.Application
-import android.content.SharedPreferences
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
@@ -24,6 +23,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -57,9 +57,10 @@ abstract class LibGroup(
         encodeDefaults = true
     }
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences by getPreferencesLazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+        if (getString(SERVER_PREF, "main") == "fourth") {
-            .migrateOldImageServer()
+            edit().putString(SERVER_PREF, "secondary").apply()
+        }
     }
 
     override val supportsLatest = true
@@ -685,11 +686,4 @@ abstract class LibGroup(
             }
         }
     }
-
-    // api changed id of servers, remap SERVER_PREF old("fourth") to new("secondary")
-    private fun SharedPreferences.migrateOldImageServer(): SharedPreferences {
-        if (getString(SERVER_PREF, "main") != "fourth") return this
-        edit().putString(SERVER_PREF, "secondary").apply()
-        return this
-    }
 }

lib-multisrc/machinetranslations/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 4
+baseVersionCode = 5
 
 dependencies {
     api(project(":lib:i18n"))

lib-multisrc/machinetranslations/src/eu/kanade/tachiyomi/multisrc/machinetranslations/MachineTranslations.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.multisrc.machinetranslations
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.os.Build
 import android.widget.Toast
@@ -20,6 +19,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -30,8 +30,6 @@ import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 import java.util.Calendar
@@ -51,9 +49,7 @@ abstract class MachineTranslations(
 
     override val lang = language.lang
 
-    protected val preferences: SharedPreferences by lazy {
+    protected val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     /**
      * A flag that tracks whether the settings have been changed. It is used to indicate if

lib-multisrc/mangathemesia/src/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaAlt.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.multisrc.mangathemesia
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
@@ -9,6 +8,7 @@ import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -16,8 +16,6 @@ import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import okhttp3.Request
 import okhttp3.Response
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.lang.ref.SoftReference
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -34,14 +32,12 @@ abstract class MangaThemesiaAlt(
     protected open val listUrl = "$mangaUrlDirectory/list-mode/"
     protected open val listSelector = "div#content div.soralist ul li a.series"
 
-    protected val preferences: SharedPreferences by lazy {
+    protected val preferences by getPreferencesLazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000).also {
+        if (contains("__random_part_cache")) {
-            if (it.contains("__random_part_cache")) {
+            edit().remove("__random_part_cache").apply()
-                it.edit().remove("__random_part_cache").apply()
+        }
-            }
+        if (contains("titles_without_random_part")) {
-            if (it.contains("titles_without_random_part")) {
+            edit().remove("titles_without_random_part").apply()
-                it.edit().remove("titles_without_random_part").apply()
-            }
         }
     }
 

src/all/akuma/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Akuma'
     extClass = '.AkumaFactory'
-    extVersionCode = 5
+    extVersionCode = 6
     isNsfw = true
 }
 

src/all/akuma/src/eu/kanade/tachiyomi/extension/all/akuma/Akuma.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.akuma
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
@@ -16,6 +15,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
@@ -25,8 +25,6 @@ import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.io.IOException
 import java.text.ParseException
 import java.text.SimpleDateFormat
@@ -112,9 +110,7 @@ class Akuma(
         return storedToken!!
     }
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     private val displayFullTitle: Boolean get() = preferences.getBoolean(PREF_TITLE, false)
 

src/all/batoto/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Bato.to'
     extClass = '.BatoToFactory'
-    extVersionCode = 48
+    extVersionCode = 49
     isNsfw = true
 }
 

src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt

@@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
@@ -48,10 +49,7 @@ open class BatoTo(
     private val siteLang: String,
 ) : ConfigurableSource, ParsedHttpSource() {
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences by getPreferencesLazy { migrateMirrorPref() }
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-            .migrateMirrorPref()
-    }
 
     override val name: String = "Bato.to"
     override val baseUrl: String get() = mirror
@@ -125,14 +123,12 @@ open class BatoTo(
         return preferences.getBoolean("${REMOVE_TITLE_VERSION_PREF}_$lang", false)
     }
 
-    private fun SharedPreferences.migrateMirrorPref(): SharedPreferences {
+    private fun SharedPreferences.migrateMirrorPref() {
         val selectedMirror = getString("${MIRROR_PREF_KEY}_$lang", MIRROR_PREF_DEFAULT_VALUE)!!
 
         if (selectedMirror in DEPRECATED_MIRRORS) {
             edit().putString("${MIRROR_PREF_KEY}_$lang", MIRROR_PREF_DEFAULT_VALUE).commit()
         }
-
-        return this
     }
 
     override val supportsLatest = true

src/all/comicfury/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Comic Fury'
     extClass = '.ComicFuryFactory'
-    extVersionCode = 3
+    extVersionCode = 4
     isNsfw = true
 }
 

src/all/comicfury/src/eu/kanade/tachiyomi/extension/all/comicfury/ComicFury.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.comicfury
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
@@ -16,13 +15,12 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Element
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -205,9 +203,7 @@ class ComicFury(
     private fun Boolean.toInt(): Int = if (this) { 0 } else { 1 }
 
     // START OF AUTHOR NOTES //
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
     companion object {
         private const val SHOW_AUTHORS_NOTES_KEY = "showAuthorsNotes"
     }

src/all/comickfun/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Comick'
     extClass = '.ComickFactory'
-    extVersionCode = 52
+    extVersionCode = 53
     isNsfw = true
 }
 

src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/Comick.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.comickfun
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
@@ -17,6 +16,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
@@ -25,8 +25,6 @@ import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -65,10 +63,7 @@ abstract class Comick(
         )
     }
 
-    private val preferences by lazy {
+    private val preferences by getPreferencesLazy { newLineIgnoredGroups() }
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-            .newLineIgnoredGroups()
-    }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         EditTextPreference(screen.context).apply {
@@ -507,8 +502,9 @@ abstract class Comick(
 
     override fun getFilterList() = getFilters()
 
-    private fun SharedPreferences.newLineIgnoredGroups(): SharedPreferences {
+    private fun SharedPreferences.newLineIgnoredGroups() {
-        if (getBoolean(MIGRATED_IGNORED_GROUPS, false)) return this
+        if (getBoolean(MIGRATED_IGNORED_GROUPS, false)) return
+
         val ignoredGroups = getString(IGNORED_GROUPS_PREF, "").orEmpty()
 
         edit()
@@ -522,8 +518,6 @@ abstract class Comick(
             )
             .putBoolean(MIGRATED_IGNORED_GROUPS, true)
             .apply()
-
-        return this
     }
 
     companion object {

src/all/comicskingdom/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'ComicsKingdom'
     extClass = '.ComicsKingdomFactory'
-    extVersionCode = 1
+    extVersionCode = 2
 }
 
 apply from: "$rootDir/common.gradle"

src/all/comicskingdom/src/eu/kanade/tachiyomi/extension/all/comicskingdom/ComicsKingdom.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.comicskingdom
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.network.GET
@@ -12,6 +11,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl
@@ -19,8 +19,6 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.Jsoup
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -301,9 +299,7 @@ class ComicsKingdom(override val lang: String) : ConfigurableSource, HttpSource(
         screen.addPreference(compactpref)
     }
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     private fun shouldCompact() = preferences.getBoolean("compactPref", true)
 

src/all/comikey/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = "Comikey"
     extClass = ".ComikeyFactory"
-    extVersionCode = 2
+    extVersionCode = 3
 }
 
 apply from: "$rootDir/common.gradle"

src/all/comikey/src/eu/kanade/tachiyomi/extension/all/comikey/Comikey.kt

@@ -24,6 +24,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl
@@ -75,9 +76,7 @@ open class Comikey(
         classLoader = this::class.java.classLoader!!,
     )
 
-    private val preferences by lazy {
+    private val preferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override fun popularMangaRequest(page: Int) = GET("$baseUrl/comics/?order=-views&page=$page", headers)
 

src/all/danbooru/src/eu/kanade/tachiyomi/extension/all/danbooru/Filters.kt

@@ -1,4 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.danbooru
+
 import eu.kanade.tachiyomi.source.model.Filter
 
 internal class FilterTags : Filter.Text("Tags")

src/all/deviantart/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'DeviantArt'
     extClass = '.DeviantArt'
-    extVersionCode = 6
+    extVersionCode = 7
     isNsfw = true
 }
 

src/all/deviantart/src/eu/kanade/tachiyomi/extension/all/deviantart/DeviantArt.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.deviantart
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
@@ -13,6 +12,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
@@ -20,8 +20,6 @@ import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.parser.Parser
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -32,9 +30,7 @@ class DeviantArt : HttpSource(), ConfigurableSource {
     override val lang = "all"
     override val supportsLatest = false
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override fun headersBuilder() = Headers.Builder().apply {
         add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:133.0) Gecko/20100101 Firefox/133.0")

src/all/ehentai/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'E-Hentai'
     extClass = '.EHFactory'
-    extVersionCode = 24
+    extVersionCode = 25
     isNsfw = true
 }
 

src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt

@@ -1,7 +1,6 @@
 package eu.kanade.tachiyomi.extension.all.ehentai
 
 import android.annotation.SuppressLint
-import android.app.Application
 import android.content.SharedPreferences
 import android.net.Uri
 import android.webkit.CookieManager
@@ -23,6 +22,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import okhttp3.CacheControl
 import okhttp3.CookieJar
 import okhttp3.Headers
@@ -30,8 +30,6 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Element
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.net.URLEncoder
 
 abstract class EHentai(
@@ -41,9 +39,7 @@ abstract class EHentai(
 
     override val name = "E-Hentai"
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     private val webViewCookieManager: CookieManager by lazy { CookieManager.getInstance() }
     private val memberId: String by lazy { getMemberIdPref() }

src/all/galaxy/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Galaxy'
     extClass = '.GalaxyFactory'
-    extVersionCode = 4
+    extVersionCode = 5
     isNsfw = false
 }
 

src/all/galaxy/src/eu/kanade/tachiyomi/extension/all/galaxy/GalaxyFactory.kt

@@ -1,13 +1,11 @@
 package eu.kanade.tachiyomi.extension.all.galaxy
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.widget.Toast
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.SourceFactory
-import uy.kohesive.injekt.Injekt
+import keiyoushi.utils.getPreferencesLazy
-import uy.kohesive.injekt.api.get
 
 class GalaxyFactory : SourceFactory {
 
@@ -22,9 +20,7 @@ class GalaxyFactory : SourceFactory {
 
         override val baseUrl by lazy { getPrefBaseUrl() }
 
-        private val preferences: SharedPreferences by lazy {
+        private val preferences: SharedPreferences by getPreferencesLazy()
-            Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-        }
 
         companion object {
             private const val RESTART_APP = ".لتطبيق الإعدادات الجديدة أعد تشغيل التطبيق"

src/all/hitomi/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Hitomi'
     extClass = '.HitomiFactory'
-    extVersionCode = 36
+    extVersionCode = 37
     isNsfw = true
 }
 

src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/Hitomi.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.hitomi
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.util.Log
 import androidx.preference.ListPreference
@@ -15,6 +14,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
@@ -32,8 +32,6 @@ import okhttp3.Response
 import okhttp3.ResponseBody.Companion.toResponseBody
 import okhttp3.internal.http2.StreamResetException
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
@@ -74,9 +72,7 @@ class Hitomi(
         }
         .build()
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
     private fun imageType() = preferences.getString(PREF_IMAGETYPE, "webp")!!
 
     override fun headersBuilder() = super.headersBuilder()

src/all/izneo/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'izneo (webtoons)'
     extClass = '.IzneoFactory'
-    extVersionCode = 5
+    extVersionCode = 6
 }
 
 apply from: "$rootDir/common.gradle"

src/all/izneo/src/eu/kanade/tachiyomi/extension/all/izneo/Izneo.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.izneo
 
-import android.app.Application
 import android.text.InputType.TYPE_CLASS_TEXT
 import android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD
 import android.util.Base64
@@ -14,6 +13,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.int
@@ -43,9 +43,7 @@ class Izneo(override val lang: String) : ConfigurableSource, HttpSource() {
 
     private val json by lazy { Injekt.get<Json>() }
 
-    private val preferences by lazy {
+    private val preferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)!!
-    }
 
     private inline val username: String
         get() = preferences.getString("username", "")!!

src/all/koharu/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'SchaleNetwork'
     extClass = '.KoharuFactory'
-    extVersionCode = 11
+    extVersionCode = 12
     isNsfw = true
 }
 

src/all/koharu/src/eu/kanade/tachiyomi/extension/all/koharu/Koharu.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.koharu
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
@@ -15,6 +14,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -23,8 +23,6 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -55,9 +53,7 @@ class Koharu(
     private val shortenTitleRegex = Regex("""(\[[^]]*]|[({][^)}]*[)}])""")
     private fun String.shortenTitle() = replace(shortenTitleRegex, "").trim()
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     private fun quality() = preferences.getString(PREF_IMAGERES, "1280")!!
 

src/all/komga/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Komga'
     extClass = '.KomgaFactory'
-    extVersionCode = 59
+    extVersionCode = 60
 }
 
 apply from: "$rootDir/common.gradle"

src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.komga
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.text.InputType
 import android.util.Log
@@ -28,6 +27,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -41,17 +41,13 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.apache.commons.text.StringSubstitutor
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.security.MessageDigest
 import java.util.Locale
 
 open class Komga(private val suffix: String = "") : ConfigurableSource, UnmeteredSource, HttpSource() {
 
-    internal val preferences: SharedPreferences by lazy {
+    internal val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     private val displayName by lazy { preferences.getString(PREF_DISPLAY_NAME, "")!! }
 

src/all/lanraragi/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'LANraragi'
     extClass = '.LANraragiFactory'
-    extVersionCode = 18
+    extVersionCode = 19
 }
 
 apply from: "$rootDir/common.gradle"

src/all/lanraragi/src/eu/kanade/tachiyomi/extension/all/lanraragi/LANraragi.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.lanraragi
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.net.Uri
 import android.text.InputType
@@ -18,6 +17,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonArray
@@ -284,9 +284,7 @@ open class LANraragi(private val suffix: String = "") : ConfigurableSource, Unme
         (0..7).map { bytes[it].toLong() and 0xff shl 8 * (7 - it) }.reduce(Long::or) and Long.MAX_VALUE
     }
 
-    internal val preferences: SharedPreferences by lazy {
+    internal val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     private fun getPrefBaseUrl(): String = preferences.getString(HOSTNAME_KEY, HOSTNAME_DEFAULT)!!
     private fun getPrefAPIKey(): String = preferences.getString(APIKEY_KEY, "")!!

src/all/luscious/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Luscious'
     extClass = '.LusciousFactory'
-    extVersionCode = 19
+    extVersionCode = 20
     isNsfw = true
 }
 

src/all/luscious/src/eu/kanade/tachiyomi/extension/all/luscious/Luscious.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.luscious
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.CheckBoxPreference
 import androidx.preference.ListPreference
@@ -15,6 +14,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
@@ -37,8 +37,6 @@ import okhttp3.Request
 import okhttp3.Response
 import okhttp3.ResponseBody.Companion.toResponseBody
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.util.Calendar
 
@@ -49,9 +47,7 @@ abstract class Luscious(
     override val supportsLatest: Boolean = true
     override val name: String = "Luscious"
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override val baseUrl: String = getMirrorPref()!!
 

src/all/mangadex/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'MangaDex'
     extClass = '.MangaDexFactory'
-    extVersionCode = 199
+    extVersionCode = 200
     isNsfw = true
 }
 

src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.mangadex
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.os.Build
 import androidx.preference.EditTextPreference
@@ -32,6 +31,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import okhttp3.CacheControl
 import okhttp3.Headers
@@ -40,8 +40,6 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.util.Date
 
 abstract class MangaDex(final override val lang: String, private val dexLang: String = lang) :
@@ -53,10 +51,7 @@ abstract class MangaDex(final override val lang: String, private val dexLang: St
 
     override val supportsLatest = true
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences by getPreferencesLazy { sanitizeExistingUuidPrefs() }
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-            .sanitizeExistingUuidPrefs()
-    }
 
     private val helper = MangaDexHelper(lang)
 
@@ -885,9 +880,9 @@ abstract class MangaDex(final override val lang: String, private val dexLang: St
      * preferences. This method clear invalid UUIDs in case the user have updated from
      * a previous version with that behaviour.
      */
-    private fun SharedPreferences.sanitizeExistingUuidPrefs(): SharedPreferences {
+    private fun SharedPreferences.sanitizeExistingUuidPrefs() {
         if (getBoolean(MDConstants.getHasSanitizedUuidsPrefKey(dexLang), false)) {
-            return this
+            return
         }
 
         val blockedGroups = getString(MDConstants.getBlockedGroupsPrefKey(dexLang), "")!!
@@ -907,7 +902,5 @@ abstract class MangaDex(final override val lang: String, private val dexLang: St
             .putString(MDConstants.getBlockedUploaderPrefKey(dexLang), blockedUploaders)
             .putBoolean(MDConstants.getHasSanitizedUuidsPrefKey(dexLang), true)
             .apply()
-
-        return this
     }
 }

src/all/mangafire/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'MangaFire'
     extClass = '.MangaFireFactory'
-    extVersionCode = 10
+    extVersionCode = 11
     isNsfw = true
 }
 

src/all/mangafire/src/eu/kanade/tachiyomi/extension/all/mangafire/MangaFire.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.mangafire
 
-import android.app.Application
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
 import eu.kanade.tachiyomi.network.GET
@@ -12,6 +11,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
@@ -24,8 +24,6 @@ import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.text.ParseException
 import java.text.SimpleDateFormat
@@ -43,9 +41,7 @@ class MangaFire(
 
     private val json: Json by injectLazy()
 
-    private val preferences by lazy {
+    private val preferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)!!
-    }
 
     override val client = network.cloudflareClient.newBuilder().addInterceptor(ImageInterceptor).build()
 

src/all/mangapark/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'MangaPark'
     extClass = '.MangaParkFactory'
-    extVersionCode = 20
+    extVersionCode = 21
     isNsfw = true
 }
 

src/all/mangapark/src/eu/kanade/tachiyomi/extension/all/mangapark/MangaPark.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.mangapark
 
-import android.app.Application
 import android.widget.Toast
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
@@ -18,6 +17,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferences
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -30,8 +30,6 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.atomic.AtomicBoolean
@@ -47,8 +45,7 @@ class MangaPark(
 
     override val versionId = 2
 
-    private val preference =
+    private val preference = getPreferences()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
 
     private val domain =
         preference.getString(MIRROR_PREF_KEY, MIRROR_PREF_DEFAULT) ?: MIRROR_PREF_DEFAULT

src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.mangaplus
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.text.Editable
 import android.text.TextWatcher
@@ -21,6 +20,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
@@ -32,8 +32,6 @@ import okhttp3.Request
 import okhttp3.Response
 import okhttp3.ResponseBody.Companion.toResponseBody
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.util.UUID
 
@@ -73,9 +71,7 @@ class MangaPlus(
         )
     }
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     /**
      * Private cache to find the newest thumbnail URL in case the existing one

src/all/mangareaderto/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.MangaReaderFactory'
     themePkg = 'mangareader'
     baseUrl = 'https://mangareader.to'
-    overrideVersionCode = 5
+    overrideVersionCode = 6
     isNsfw = true
 }
 

src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/MangaReader.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.mangareaderto
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
@@ -13,11 +12,11 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferences
+import keiyoushi.utils.getPreferencesLazy
 import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 
 class MangaReader(
     language: Language,
@@ -32,9 +31,7 @@ class MangaReader(
         .addInterceptor(ImageInterceptor)
         .build()
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     // =============================== Search ===============================
 

src/all/mango/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Mango'
     extClass = '.Mango'
-    extVersionCode = 9
+    extVersionCode = 10
 }
 
 apply from: "$rootDir/common.gradle"

src/all/mango/src/eu/kanade/tachiyomi/extension/all/mango/Mango.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.mango
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.text.InputType
 import android.widget.Toast
@@ -18,6 +17,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import info.debatty.java.stringsimilarity.JaroWinkler
 import info.debatty.java.stringsimilarity.Levenshtein
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
@@ -34,8 +34,6 @@ import okhttp3.Request
 import okhttp3.RequestBody
 import okhttp3.Response
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.io.IOException
 
@@ -214,9 +212,7 @@ class Mango : ConfigurableSource, UnmeteredSource, HttpSource() {
         Headers.Builder()
             .add("User-Agent", "Tachiyomi Mango v${AppInfo.getVersionName()}")
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override val client: OkHttpClient =
         network.client.newBuilder()

src/all/namicomi/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'NamiComi'
     extClass = '.NamiComiFactory'
-    extVersionCode = 2
+    extVersionCode = 3
     isNsfw = false
 }
 

src/all/namicomi/src/eu/kanade/tachiyomi/extension/all/namicomi/NamiComi.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.namicomi
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
@@ -22,6 +21,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import okhttp3.CacheControl
@@ -31,8 +31,6 @@ import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import okio.IOException
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 
 abstract class NamiComi(final override val lang: String, private val extLang: String = lang) :
     ConfigurableSource, HttpSource() {
@@ -41,9 +39,7 @@ abstract class NamiComi(final override val lang: String, private val extLang: St
     override val baseUrl = NamiComiConstants.webUrl
     override val supportsLatest = true
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     private val helper = NamiComiHelper(lang)
 

src/all/nhentai/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'NHentai'
     extClass = '.NHFactory'
-    extVersionCode = 50
+    extVersionCode = 51
     isNsfw = true
 }
 

src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHentai.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.nhentai
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
@@ -25,6 +24,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -34,8 +34,6 @@ import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 
 open class NHentai(
@@ -53,9 +51,7 @@ open class NHentai(
 
     private val json: Json by injectLazy()
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override val client: OkHttpClient by lazy {
         network.cloudflareClient.newBuilder()

src/all/novelcool/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'NovelCool'
     extClass = '.NovelCoolFactory'
-    extVersionCode = 3
+    extVersionCode = 4
     isNsfw = true
 }
 

src/all/novelcool/src/eu/kanade/tachiyomi/extension/all/novelcool/NovelCool.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.novelcool
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
@@ -17,6 +16,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -32,8 +32,6 @@ import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import org.jsoup.select.Elements
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -62,9 +60,7 @@ open class NovelCool(
 
     private val json: Json by injectLazy()
 
-    private val preference by lazy {
+    private val preference by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override fun fetchPopularManga(page: Int): Observable<MangasPage> {
         return when (preference.useAppApi) {

src/all/peppercarrot/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Pepper&Carrot'
     extClass = '.PepperCarrot'
-    extVersionCode = 2
+    extVersionCode = 3
 }
 
 apply from: "$rootDir/common.gradle"

src/all/peppercarrot/src/eu/kanade/tachiyomi/extension/all/peppercarrot/PepperCarrot.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.peppercarrot
 
-import android.app.Application
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.ConfigurableSource
@@ -11,6 +10,8 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferences
+import keiyoushi.utils.getPreferencesLazy
 import okhttp3.CacheControl
 import okhttp3.Request
 import okhttp3.Response
@@ -18,8 +19,6 @@ import org.jsoup.nodes.TextNode
 import org.jsoup.select.Evaluator
 import rx.Observable
 import rx.Single
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -31,9 +30,7 @@ class PepperCarrot : HttpSource(), ConfigurableSource {
 
     override val baseUrl = BASE_URL
 
-    private val preferences by lazy {
+    private val preferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)!!
-    }
 
     override fun fetchPopularManga(page: Int): Observable<MangasPage> = Single.create<MangasPage> {
         updateLangData(client, headers, preferences)

src/all/photos18/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Photos18'
     extClass = '.Photos18'
-    extVersionCode = 5
+    extVersionCode = 6
     isNsfw = true
 }
 

src/all/photos18/src/eu/kanade/tachiyomi/extension/all/photos18/Photos18.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.photos18
 
-import android.app.Application
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
 import eu.kanade.tachiyomi.network.GET
@@ -13,6 +12,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -21,8 +21,6 @@ import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.select.Evaluator
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 
 class Photos18 : HttpSource(), ConfigurableSource {
     override val name = "Photos18"
@@ -156,9 +154,7 @@ class Photos18 : HttpSource(), ConfigurableSource {
         }
     }
 
-    private val preferences by lazy {
+    private val preferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)!!
-    }
 
     private val useTrad get() = preferences.getBoolean("ZH_HANT", false)
 

src/all/pixiv/src/eu/kanade/tachiyomi/extension/all/pixiv/PixivFilters.kt

@@ -1,4 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.pixiv
+
 import eu.kanade.tachiyomi.source.model.Filter
 
 private val TYPE_VALUES = arrayOf("All", "Illustrations", "Manga")

src/all/pixiv/src/eu/kanade/tachiyomi/extension/all/pixiv/PixivTypes.kt

@@ -1,4 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.pixiv
+
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonPrimitive
 

src/all/projectsuki/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Project Suki'
     extClass = '.ProjectSuki'
-    extVersionCode = 4
+    extVersionCode = 5
 }
 
 apply from: "$rootDir/common.gradle"

src/all/projectsuki/src/eu/kanade/tachiyomi/extension/all/projectsuki/ProjectSuki.kt

@@ -22,6 +22,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferences
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -188,7 +189,7 @@ class ProjectSuki : HttpSource(), ConfigurableSource {
     override val id: Long = 8965918600406781666L
 
     /** Handles extension preferences found in Extensions > Project Suki > Gear icon */
-    private val preferences = ProjectSukiPreferences(id)
+    private val preferences = ProjectSukiPreferences(getPreferences())
 
     /** See [Kotlinx-Serialization](https://github.com/Kotlin/kotlinx.serialization). */
     private val json: Json = Json {

src/all/projectsuki/src/eu/kanade/tachiyomi/extension/all/projectsuki/ProjectSukiPreferences.kt

@@ -1,14 +1,11 @@
 package eu.kanade.tachiyomi.extension.all.projectsuki
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.lib.randomua.addRandomUAPreferenceToScreen
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.util.Locale
 
 /**
@@ -20,9 +17,7 @@ private inline val INFO: Nothing get() = error("INFO")
 /**
  * @author Federico d'Alonzo <me@npgx.dev>
  */
-class ProjectSukiPreferences(id: Long) {
+class ProjectSukiPreferences(internal val shared: SharedPreferences) {
-
-    internal val shared by lazy { Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000) }
 
     abstract inner class PSPreference<Raw : Any, T : Any>(val preferenceIdentifier: String, val default: Raw) {
 

src/all/simplycosplay/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Simply Cosplay'
     extClass = '.SimplyCosplay'
-    extVersionCode = 1
+    extVersionCode = 2
     isNsfw = true
 }
 

src/all/simplycosplay/src/eu/kanade/tachiyomi/extension/all/simplycosplay/SimplyCosplay.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.simplycosplay
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.util.Log
 import androidx.preference.ListPreference
@@ -16,6 +15,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl
@@ -24,8 +24,6 @@ import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.io.IOException
 import java.text.SimpleDateFormat
@@ -53,9 +51,7 @@ class SimplyCosplay : HttpSource(), ConfigurableSource {
 
     private val json: Json by injectLazy()
 
-    private val preference by lazy {
+    private val preference by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     private fun tokenIntercept(chain: Interceptor.Chain): Response {
         val request = chain.request()

src/all/simplyhentai/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Simply Hentai'
     extClass = '.SimplyHentaiFactory'
-    extVersionCode = 7
+    extVersionCode = 8
     isNsfw = true
 }
 

src/all/simplyhentai/src/eu/kanade/tachiyomi/extension/all/simplyhentai/SimplyHentai.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.simplyhentai
 
-import android.app.Application
 import android.net.Uri
 import androidx.preference.EditTextPreference
 import androidx.preference.PreferenceScreen
@@ -12,11 +11,10 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
 import okhttp3.Response
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -40,9 +38,7 @@ open class SimplyHentai(
 
     private val json: Json by injectLazy()
 
-    private val preferences by lazy {
+    private val preferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)!!
-    }
 
     override fun popularMangaRequest(page: Int) =
         Uri.parse("$apiUrl/tag/$langName").buildUpon().run {

src/all/thunderscans/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.ThunderScansFactory'
     themePkg = 'mangathemesia'
     baseUrl = 'https://en-thunderscans.com'
-    overrideVersionCode = 9
+    overrideVersionCode = 10
     isNsfw = false
 }
 

src/all/webtoons/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.WebtoonsFactory'
     themePkg = 'webtoons'
     baseUrl = 'https://www.webtoons.com'
-    overrideVersionCode = 39
+    overrideVersionCode = 40
 }
 
 apply from: "$rootDir/common.gradle"

src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsSrc.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.webtoons
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
@@ -10,12 +9,11 @@ import eu.kanade.tachiyomi.multisrc.webtoons.Webtoons
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.Page
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.OkHttpClient
 import org.jsoup.nodes.Document
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -32,9 +30,7 @@ open class WebtoonsSrc(
         .addInterceptor(TextInterceptor())
         .build()
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         val authorsNotesPref = SwitchPreferenceCompat(screen.context).apply {

src/ar/dilar/build.gradle

@@ -2,7 +2,7 @@ ext {
     extName = 'Dilar'
     extClass = '.Dilar'
     themePkg = 'gmanga'
-    overrideVersionCode = 2
+    overrideVersionCode = 3
 }
 
 apply from: "$rootDir/common.gradle"

src/ar/dilar/src/eu/kanade/tachiyomi/extension/ar/dilar/Dilar.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.ar.dilar
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.widget.Toast
 import androidx.preference.ListPreference
@@ -10,10 +9,9 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
+import keiyoushi.utils.getPreferencesLazy
 import okhttp3.Request
 import okhttp3.Response
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 
 private const val MIRROR_PREF_KEY = "MIRROR"
 private const val MIRROR_PREF_TITLE = "Dilar : Mirror Urls"
@@ -65,7 +63,5 @@ class Dilar :
 
     override val cdnUrl by lazy { baseUrl }
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 }

src/ar/empirewebtoon/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.EmpireWebtoon'
     themePkg = 'madara'
     baseUrl = 'https://webtoonempire-ron.com'
-    overrideVersionCode = 4
+    overrideVersionCode = 5
     isNsfw = true
 }
 

src/ar/empirewebtoon/src/eu/kanade/tachiyomi/extension/ar/empirewebtoon/EmpireWebtoon.kt

@@ -1,13 +1,11 @@
 package eu.kanade.tachiyomi.extension.ar.empirewebtoon
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.widget.Toast
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 import eu.kanade.tachiyomi.source.ConfigurableSource
-import uy.kohesive.injekt.Injekt
+import keiyoushi.utils.getPreferences
-import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -20,8 +18,7 @@ class EmpireWebtoon :
     ),
     ConfigurableSource {
 
-    private val preferences: SharedPreferences =
+    private val preferences: SharedPreferences = getPreferences()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
 
     init {
         preferences.getString(DEFAULT_BASE_URL_PREF, null).let { prefDefaultBaseUrl ->

src/ar/hentaislayer/build.gradle

@@ -2,7 +2,7 @@ ext {
     extName = 'Hentai Slayer'
     extClass = '.HentaiSlayer'
     themePkg = 'fuzzydoodle'
-    overrideVersionCode = 2
+    overrideVersionCode = 3
     isNsfw = true
 }
 

src/ar/hentaislayer/src/eu/kanade/tachiyomi/extension/ar/hentaislayer/HentaiSlayer.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.ar.hentaislayer
 
-import android.app.Application
 import android.widget.Toast
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
@@ -8,8 +7,7 @@ import eu.kanade.tachiyomi.multisrc.fuzzydoodle.FuzzyDoodle
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.ConfigurableSource
-import uy.kohesive.injekt.Injekt
+import keiyoushi.utils.getPreferencesLazy
-import uy.kohesive.injekt.api.get
 
 class HentaiSlayer : FuzzyDoodle("هنتاي سلاير", "https://hentaislayer.net", "ar"), ConfigurableSource {
 
@@ -20,9 +18,7 @@ class HentaiSlayer : FuzzyDoodle("هنتاي سلاير", "https://hentaislayer.
     override fun headersBuilder() = super.headersBuilder()
         .set("Origin", baseUrl)
 
-    private val preferences by lazy {
+    private val preferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override fun latestPageRequest(page: Int) = GET("$baseUrl/latest-${getLatestTypes()}?page=$page", headers)
 

src/ar/mangalek/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.Mangalek'
     themePkg = 'madara'
     baseUrl = 'https://lekmanga.net'
-    overrideVersionCode = 7
+    overrideVersionCode = 8
     isNsfw = false
 }
 

src/ar/mangalek/src/eu/kanade/tachiyomi/extension/ar/mangalek/Mangalek.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.ar.mangalek
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.widget.Toast
 import androidx.preference.ListPreference
@@ -11,13 +10,12 @@ import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.SManga
+import keiyoushi.utils.getPreferencesLazy
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import okhttp3.FormBody
 import okhttp3.Request
 import okhttp3.Response
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -54,9 +52,7 @@ class Mangalek :
         }
     }
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         val mirrorPref = ListPreference(screen.context).apply {

src/ar/mangalink/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.Mangalink'
     themePkg = 'madara'
     baseUrl = 'https://link-manga.com'
-    overrideVersionCode = 3
+    overrideVersionCode = 4
 }
 
 apply from: "$rootDir/common.gradle"

src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/Mangalink.kt

@@ -1,13 +1,11 @@
 package eu.kanade.tachiyomi.extension.ar.mangalink
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.widget.Toast
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 import eu.kanade.tachiyomi.source.ConfigurableSource
-import uy.kohesive.injekt.Injekt
+import keiyoushi.utils.getPreferencesLazy
-import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -24,9 +22,7 @@ class Mangalink :
     override val useLoadMoreRequest = LoadMoreStrategy.Always
     override val baseUrl by lazy { getPrefBaseUrl() }
 
-    private val preferences: SharedPreferences by lazy {
+    private val preferences: SharedPreferences by getPreferencesLazy()
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
 
     companion object {
         private const val RESTART_TACHIYOMI = ".لتطبيق الإعدادات الجديدة Tachiyomi أعد تشغيل"

src/ar/mangaswat/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.MangaSwat'
     themePkg = 'mangathemesia'
     baseUrl = 'https://swatscans.com'
-    overrideVersionCode = 25
+    overrideVersionCode = 26
 }
 
 apply from: "$rootDir/common.gradle"