Oopsie

app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt

@@ -36,86 +36,86 @@ object SettingsSecurityScreen : SearchableSettings {
             getFirebaseGroup(privacyPreferences),
         )
     }
-}
 
-@Composable
-private fun getSecurityGroup(
-    securityPreferences: SecurityPreferences,
-): Preference.PreferenceGroup {
-    val context = LocalContext.current
-    val authSupported = remember { context.isAuthenticationSupported() }
-    val useAuthPref = securityPreferences.useAuthenticator()
-    val useAuth by useAuthPref.collectAsState()
+    @Composable
+    private fun getSecurityGroup(
+        securityPreferences: SecurityPreferences,
+    ): Preference.PreferenceGroup {
+        val context = LocalContext.current
+        val authSupported = remember { context.isAuthenticationSupported() }
+        val useAuthPref = securityPreferences.useAuthenticator()
+        val useAuth by useAuthPref.collectAsState()
 
-    return Preference.PreferenceGroup(
-        title = stringResource(MR.strings.pref_security),
-        preferenceItems = persistentListOf(
-            Preference.PreferenceItem.SwitchPreference(
-                pref = useAuthPref,
-                title = stringResource(MR.strings.lock_with_biometrics),
-                enabled = authSupported,
-                onValueChanged = {
-                    (context as FragmentActivity).authenticate(
-                        title = context.stringResource(MR.strings.lock_with_biometrics),
-                    )
-                },
-            ),
-            Preference.PreferenceItem.ListPreference(
-                pref = securityPreferences.lockAppAfter(),
-                title = stringResource(MR.strings.lock_when_idle),
-                enabled = authSupported && useAuth,
-                entries = LockAfterValues
-                    .associateWith {
-                        when (it) {
-                            -1 -> stringResource(MR.strings.lock_never)
-                            0 -> stringResource(MR.strings.lock_always)
-                            else -> pluralStringResource(MR.plurals.lock_after_mins, count = it, it)
+        return Preference.PreferenceGroup(
+            title = stringResource(MR.strings.pref_security),
+            preferenceItems = persistentListOf(
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = useAuthPref,
+                    title = stringResource(MR.strings.lock_with_biometrics),
+                    enabled = authSupported,
+                    onValueChanged = {
+                        (context as FragmentActivity).authenticate(
+                            title = context.stringResource(MR.strings.lock_with_biometrics),
+                        )
+                    },
+                ),
+                Preference.PreferenceItem.ListPreference(
+                    pref = securityPreferences.lockAppAfter(),
+                    title = stringResource(MR.strings.lock_when_idle),
+                    enabled = authSupported && useAuth,
+                    entries = LockAfterValues
+                        .associateWith {
+                            when (it) {
+                                -1 -> stringResource(MR.strings.lock_never)
+                                0 -> stringResource(MR.strings.lock_always)
+                                else -> pluralStringResource(MR.plurals.lock_after_mins, count = it, it)
+                            }
                         }
-                    }
-                    .toImmutableMap(),
-                onValueChanged = {
-                    (context as FragmentActivity).authenticate(
-                        title = context.stringResource(MR.strings.lock_when_idle),
-                    )
-                },
-            ),
+                        .toImmutableMap(),
+                    onValueChanged = {
+                        (context as FragmentActivity).authenticate(
+                            title = context.stringResource(MR.strings.lock_when_idle),
+                        )
+                    },
+                ),
 
-            Preference.PreferenceItem.SwitchPreference(
-                pref = securityPreferences.hideNotificationContent(),
-                title = stringResource(MR.strings.hide_notification_content),
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = securityPreferences.hideNotificationContent(),
+                    title = stringResource(MR.strings.hide_notification_content),
+                ),
+                Preference.PreferenceItem.ListPreference(
+                    pref = securityPreferences.secureScreen(),
+                    title = stringResource(MR.strings.secure_screen),
+                    entries = SecurityPreferences.SecureScreenMode.entries
+                        .associateWith { stringResource(it.titleRes) }
+                        .toImmutableMap(),
+                ),
+                Preference.PreferenceItem.InfoPreference(stringResource(MR.strings.secure_screen_summary)),
             ),
-            Preference.PreferenceItem.ListPreference(
-                pref = securityPreferences.secureScreen(),
-                title = stringResource(MR.strings.secure_screen),
-                entries = SecurityPreferences.SecureScreenMode.entries
-                    .associateWith { stringResource(it.titleRes) }
-                    .toImmutableMap(),
-            ),
-            Preference.PreferenceItem.InfoPreference(stringResource(MR.strings.secure_screen_summary)),
-        ),
-    )
-}
+        )
+    }
 
-@Composable
-private fun getFirebaseGroup(
-    privacyPreferences: PrivacyPreferences,
-): Preference.PreferenceGroup {
-    return Preference.PreferenceGroup(
-        title = stringResource(MR.strings.pref_firebase),
-        preferenceItems = persistentListOf(
-            Preference.PreferenceItem.SwitchPreference(
-                pref = privacyPreferences.crashlytics(),
-                title = stringResource(MR.strings.onboarding_permission_crashlytics),
-                subtitle = stringResource(MR.strings.onboarding_permission_crashlytics_description),
+    @Composable
+    private fun getFirebaseGroup(
+        privacyPreferences: PrivacyPreferences,
+    ): Preference.PreferenceGroup {
+        return Preference.PreferenceGroup(
+            title = stringResource(MR.strings.pref_firebase),
+            preferenceItems = persistentListOf(
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = privacyPreferences.crashlytics(),
+                    title = stringResource(MR.strings.onboarding_permission_crashlytics),
+                    subtitle = stringResource(MR.strings.onboarding_permission_crashlytics_description),
+                ),
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = privacyPreferences.analytics(),
+                    title = stringResource(MR.strings.onboarding_permission_analytics),
+                    subtitle = stringResource(MR.strings.onboarding_permission_analytics_description),
+                ),
+                Preference.PreferenceItem.InfoPreference(stringResource(MR.strings.firebase_summary)),
             ),
-            Preference.PreferenceItem.SwitchPreference(
-                pref = privacyPreferences.analytics(),
-                title = stringResource(MR.strings.onboarding_permission_analytics),
-                subtitle = stringResource(MR.strings.onboarding_permission_analytics_description),
-            ),
-            Preference.PreferenceItem.InfoPreference(stringResource(MR.strings.firebase_summary)),
-        ),
-    )
+        )
+    }
 }
 
 private val LockAfterValues = persistentListOf(

app/src/main/java/eu/kanade/tachiyomi/di/PreferenceModule.kt

@@ -5,6 +5,7 @@ import eu.kanade.domain.base.BasePreferences
 import eu.kanade.domain.source.service.SourcePreferences
 import eu.kanade.domain.track.service.TrackPreferences
 import eu.kanade.domain.ui.UiPreferences
+import eu.kanade.tachiyomi.core.security.PrivacyPreferences
 import eu.kanade.tachiyomi.core.security.SecurityPreferences
 import eu.kanade.tachiyomi.network.NetworkPreferences
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
@@ -39,6 +40,9 @@ class PreferenceModule(val app: Application) : InjektModule {
         addSingletonFactory {
             SecurityPreferences(get())
         }
+        addSingletonFactory {
+            PrivacyPreferences(get())
+        }
         addSingletonFactory {
             LibraryPreferences(get())
         }

core/common/src/main/kotlin/eu/kanade/tachiyomi/core/security/PrivacyPreferences.kt

@@ -5,7 +5,7 @@ import tachiyomi.core.common.preference.PreferenceStore
 class PrivacyPreferences(
     private val preferenceStore: PreferenceStore,
 ) {
-    fun crashlytics() = preferenceStore.getBoolean("crashlytics", false)
+    fun crashlytics() = preferenceStore.getBoolean("crashlytics", true)
 
-    fun analytics() = preferenceStore.getBoolean("analytics", false)
+    fun analytics() = preferenceStore.getBoolean("analytics", true)
 }