javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases 3 Wiki Activity

Replace preference getter functions with properties (#3091)

Browse Source
This commit is contained in:
AntsyLich
2026-03-20 14:57:01 +06:00
committed by GitHub
parent 2f9edb551f
commit 87665736a9
126 changed files with 816 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/common/src/main/kotlin/eu/kanade/tachiyomi/core/security/PrivacyPreferences.kt
+4 -3
View File
@@ -1,11 +1,12 @@
package eu.kanade.tachiyomi.core.security
import tachiyomi.core.common.preference.Preference
import tachiyomi.core.common.preference.PreferenceStore
class PrivacyPreferences(
private val preferenceStore: PreferenceStore,
preferenceStore: PreferenceStore,
) {
fun crashlytics() = preferenceStore.getBoolean("crashlytics", true)
val crashlytics: Preference<Boolean> = preferenceStore.getBoolean("crashlytics", true)
fun analytics() = preferenceStore.getBoolean("analytics", true)
val analytics: Preference<Boolean> = preferenceStore.getBoolean("analytics", true)
}
core/common/src/main/kotlin/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt
+10 -7
View File
@@ -7,22 +7,25 @@ import tachiyomi.core.common.preference.getEnum
import tachiyomi.i18n.MR
class SecurityPreferences(
private val preferenceStore: PreferenceStore,
preferenceStore: PreferenceStore,
) {
fun useAuthenticator() = preferenceStore.getBoolean("use_biometric_lock", false)
val useAuthenticator: Preference<Boolean> = preferenceStore.getBoolean("use_biometric_lock", false)
fun lockAppAfter() = preferenceStore.getInt("lock_app_after", 0)
val lockAppAfter: Preference<Int> = preferenceStore.getInt("lock_app_after", 0)
fun secureScreen() = preferenceStore.getEnum("secure_screen_v2", SecureScreenMode.INCOGNITO)
val secureScreen: Preference<SecureScreenMode> = preferenceStore.getEnum(
"secure_screen_v2",
SecureScreenMode.INCOGNITO,
)
fun hideNotificationContent() = preferenceStore.getBoolean("hide_notification_content", false)
val hideNotificationContent: Preference<Boolean> = preferenceStore.getBoolean("hide_notification_content", false)
/**
* For app lock. Will be set when there is a pending timed lock.
* Otherwise this pref should be deleted.
* Otherwise, this pref should be deleted.
*/
fun lastAppClosed() = preferenceStore.getLong(
val lastAppClosed: Preference<Long> = preferenceStore.getLong(
Preference.appStateKey("last_app_closed"),
0,
)
core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt
+3 -3
View File
@@ -36,14 +36,14 @@ class NetworkHelper(
.addNetworkInterceptor(IgnoreGzipInterceptor())
.addNetworkInterceptor(BrotliInterceptor)
if (preferences.verboseLogging().get()) {
if (preferences.verboseLogging.get()) {
val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
level = HttpLoggingInterceptor.Level.HEADERS
}
builder.addNetworkInterceptor(httpLoggingInterceptor)
}
when (preferences.dohProvider().get()) {
when (preferences.dohProvider.get()) {
PREF_DOH_CLOUDFLARE -> builder.dohCloudflare()
PREF_DOH_GOOGLE -> builder.dohGoogle()
PREF_DOH_ADGUARD -> builder.dohAdGuard()
@@ -75,5 +75,5 @@ class NetworkHelper(
@Suppress("UNUSED")
val cloudflareClient: OkHttpClient = client
fun defaultUserAgentProvider() = preferences.defaultUserAgent().get().trim()
fun defaultUserAgentProvider() = preferences.defaultUserAgent.get().trim()
}
core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkPreferences.kt
+8 -14
View File
@@ -4,22 +4,16 @@ import tachiyomi.core.common.preference.Preference
import tachiyomi.core.common.preference.PreferenceStore
class NetworkPreferences(
private val preferenceStore: PreferenceStore,
private val verboseLogging: Boolean = false,
preferenceStore: PreferenceStore,
verboseLoggingDefault: Boolean = false,
) {
fun verboseLogging(): Preference<Boolean> {
return preferenceStore.getBoolean("verbose_logging", verboseLogging)
}
val verboseLogging: Preference<Boolean> = preferenceStore.getBoolean("verbose_logging", verboseLoggingDefault)
fun dohProvider(): Preference<Int> {
return preferenceStore.getInt("doh_provider", -1)
}
val dohProvider: Preference<Int> = preferenceStore.getInt("doh_provider", -1)
fun defaultUserAgent(): Preference<String> {
return preferenceStore.getString(
"default_user_agent",
"Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Mobile Safari/537.36",
)
}
val defaultUserAgent: Preference<String> = preferenceStore.getString(
"default_user_agent",
"Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Mobile Safari/537.36",
)
}