Directly use shortcuts and update google services and firebase

app/src/main/java/eu/kanade/tachiyomi/App.kt

@@ -31,8 +31,6 @@ import com.elvishew.xlog.printer.Printer
 import com.elvishew.xlog.printer.file.backup.NeverBackupStrategy
 import com.elvishew.xlog.printer.file.clean.FileLastModifiedCleanStrategy
 import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator
-import com.google.firebase.analytics.ktx.analytics
-import com.google.firebase.ktx.Firebase
 import eu.kanade.domain.DomainModule
 import eu.kanade.domain.SYDomainModule
 import eu.kanade.domain.base.BasePreferences
@@ -53,7 +51,6 @@ import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate
 import eu.kanade.tachiyomi.util.system.WebViewUtil
 import eu.kanade.tachiyomi.util.system.animatorDurationScale
 import eu.kanade.tachiyomi.util.system.cancelNotification
-import eu.kanade.tachiyomi.util.system.isPreviewBuildType
 import eu.kanade.tachiyomi.util.system.notify
 import exh.log.CrashlyticsPrinter
 import exh.log.EHLogLevel
@@ -91,7 +88,6 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
         // if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
         setupExhLogging() // EXH logging
         LogcatLogger.install(XLogLogcatLogger()) // SY Redirect Logcat to XLog
-        if (!BuildConfig.DEBUG) addAnalytics()
 
         GlobalExceptionHandler.initialize(applicationContext, CrashActivity::class.java)
 
@@ -196,12 +192,6 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
         SecureActivityDelegate.onApplicationStart()
     }
 
-    private fun addAnalytics() {
-        if (isPreviewBuildType) {
-            Firebase.analytics.setUserProperty("preview_version", syDebugVersion)
-        }
-    }
-
     override fun onStop(owner: LifecycleOwner) {
         SecureActivityDelegate.onApplicationStopped()
     }

app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

@@ -50,6 +50,8 @@ import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior
 import cafe.adriel.voyager.navigator.currentOrThrow
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import com.google.firebase.analytics.ktx.analytics
+import com.google.firebase.ktx.Firebase
 import eu.kanade.domain.base.BasePreferences
 import eu.kanade.domain.source.service.SourcePreferences
 import eu.kanade.domain.ui.UiPreferences
@@ -78,6 +80,7 @@ import eu.kanade.tachiyomi.ui.manga.MangaScreen
 import eu.kanade.tachiyomi.ui.more.NewUpdateScreen
 import eu.kanade.tachiyomi.util.system.dpToPx
 import eu.kanade.tachiyomi.util.system.isNavigationBarNeedsScrim
+import eu.kanade.tachiyomi.util.system.isPreviewBuildType
 import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.util.view.setComposeContent
 import exh.EXHMigrations
@@ -87,6 +90,7 @@ import exh.log.DebugModeOverlay
 import exh.source.BlacklistedSources
 import exh.source.EH_SOURCE_ID
 import exh.source.EXH_SOURCE_ID
+import exh.syDebugVersion
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.callbackFlow
@@ -156,6 +160,7 @@ class MainActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
 
         val didMigration = if (savedInstanceState == null) {
+            addAnalytics()
             EXHMigrations.upgrade(
                 context = applicationContext,
                 basePreferences = preferences,
@@ -523,6 +528,14 @@ class MainActivity : BaseActivity() {
         registerSecureActivity(this)
     }
 
+    // SY -->
+    private fun addAnalytics() {
+        if (!BuildConfig.DEBUG && isPreviewBuildType) {
+            Firebase.analytics.setUserProperty("preview_version", syDebugVersion)
+        }
+    }
+    // SY <--
+
     companion object {
         // Splash screen
         private const val SPLASH_MIN_DURATION = 500 // ms

app/src/main/java/exh/log/CrashlyticsPrinter.kt

@@ -1,7 +1,8 @@
 package exh.log
 
 import com.elvishew.xlog.printer.Printer
-import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.ktx.Firebase
 import eu.kanade.tachiyomi.BuildConfig
 
 class CrashlyticsPrinter(private val logLevel: Int) : Printer {
@@ -15,7 +16,7 @@ class CrashlyticsPrinter(private val logLevel: Int) : Printer {
     override fun println(logLevel: Int, tag: String?, msg: String?) {
         if (logLevel >= this.logLevel) {
             try {
-                FirebaseCrashlytics.getInstance().log("$logLevel/$tag: $msg")
+                Firebase.crashlytics.log("$logLevel/$tag: $msg")
             } catch (t: Throwable) {
                 // Crash in debug if shit like this happens
                 if (BuildConfig.DEBUG) throw t