Progress?

This commit is contained in:
Roshan Varughese 2024-09-22 01:54:34 +12:00
parent de7e394844
commit 0a33026c49
4 changed files with 16 additions and 11 deletions

View File

@ -1,7 +1,7 @@
import android.content.Context import android.content.Context
import eu.kanade.domain.base.BasePreferences import eu.kanade.tachiyomi.core.security.SecurityPreferences
object Firebase { object Firebase {
fun setup(context: Context, preference: BasePreferences) = Unit fun setup(context: Context, preference: SecurityPreferences) = Unit
} }

View File

@ -121,10 +121,9 @@ internal class PermissionStep : OnboardingStep {
subtitle = stringResource(MR.strings.onboarding_permission_crashlytics_description), subtitle = stringResource(MR.strings.onboarding_permission_crashlytics_description),
granted = allowCrashLogs, granted = allowCrashLogs,
onButtonClick = { onButtonClick = {
// Toggle the granted state
allowCrashLogs = !allowCrashLogs allowCrashLogs = !allowCrashLogs
securityPreferences.crashlytics().set(allowCrashLogs) securityPreferences.crashlytics().set(allowCrashLogs)
} },
) )
PermissionItem( PermissionItem(
@ -132,10 +131,9 @@ internal class PermissionStep : OnboardingStep {
subtitle = stringResource(MR.strings.onboarding_permission_analytics_description), subtitle = stringResource(MR.strings.onboarding_permission_analytics_description),
granted = allowAnalytics, granted = allowAnalytics,
onButtonClick = { onButtonClick = {
// Toggle the granted state
allowAnalytics = !allowAnalytics allowAnalytics = !allowAnalytics
securityPreferences.analytics().set(allowAnalytics) securityPreferences.analytics().set(allowAnalytics)
} },
) )
} }
} }

View File

@ -1,6 +1,5 @@
package eu.kanade.tachiyomi package eu.kanade.tachiyomi
import Firebase
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Application import android.app.Application
import android.app.PendingIntent import android.app.PendingIntent
@ -27,6 +26,7 @@ import eu.kanade.domain.DomainModule
import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.base.BasePreferences
import eu.kanade.domain.ui.UiPreferences import eu.kanade.domain.ui.UiPreferences
import eu.kanade.domain.ui.model.setAppCompatDelegateThemeMode import eu.kanade.domain.ui.model.setAppCompatDelegateThemeMode
import eu.kanade.tachiyomi.core.security.SecurityPreferences
import eu.kanade.tachiyomi.crash.CrashActivity import eu.kanade.tachiyomi.crash.CrashActivity
import eu.kanade.tachiyomi.crash.GlobalExceptionHandler import eu.kanade.tachiyomi.crash.GlobalExceptionHandler
import eu.kanade.tachiyomi.data.coil.BufferedSourceFetcher import eu.kanade.tachiyomi.data.coil.BufferedSourceFetcher
@ -51,6 +51,7 @@ import kotlinx.coroutines.flow.onEach
import logcat.AndroidLogcatLogger import logcat.AndroidLogcatLogger
import logcat.LogPriority import logcat.LogPriority
import logcat.LogcatLogger import logcat.LogcatLogger
import mihon.core.firebase.Firebase
import mihon.core.migration.Migrator import mihon.core.migration.Migrator
import mihon.core.migration.migrations.migrations import mihon.core.migration.migrations.migrations
import org.conscrypt.Conscrypt import org.conscrypt.Conscrypt
@ -68,6 +69,7 @@ import java.security.Security
class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factory { class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factory {
private val basePreferences: BasePreferences by injectLazy() private val basePreferences: BasePreferences by injectLazy()
private val securityPreferences: SecurityPreferences by injectLazy()
private val networkPreferences: NetworkPreferences by injectLazy() private val networkPreferences: NetworkPreferences by injectLazy()
private val disableIncognitoReceiver = DisableIncognitoReceiver() private val disableIncognitoReceiver = DisableIncognitoReceiver()
@ -76,7 +78,7 @@ class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factor
override fun onCreate() { override fun onCreate() {
super<Application>.onCreate() super<Application>.onCreate()
patchInjekt() patchInjekt()
Firebase.setup(applicationContext, basePreferences) Firebase.setup(applicationContext, securityPreferences)
GlobalExceptionHandler.initialize(applicationContext, CrashActivity::class.java) GlobalExceptionHandler.initialize(applicationContext, CrashActivity::class.java)

View File

@ -2,12 +2,17 @@ package mihon.core.firebase
import android.content.Context import android.content.Context
import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.analytics.FirebaseAnalytics
import eu.kanade.domain.base.BasePreferences import com.google.firebase.crashlytics.FirebaseCrashlytics
import eu.kanade.tachiyomi.core.security.SecurityPreferences
import kotlinx.coroutines.flow.onEach
object Firebase { object Firebase {
fun setup(context: Context, preference: BasePreferences) { fun setup(context: Context, preference: SecurityPreferences) {
preference.incognitoMode().changes().onEach { enabled -> preference.analytics().changes().onEach { enabled ->
FirebaseAnalytics.getInstance(context).setAnalyticsCollectionEnabled(enabled) FirebaseAnalytics.getInstance(context).setAnalyticsCollectionEnabled(enabled)
} }
preference.crashlytics().changes().onEach { enabled ->
FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(enabled)
}
} }
} }