diff --git a/app/src/dev/java/exh/log/CrashlyticsPrinter.kt b/app/src/dev/java/exh/log/CrashlyticsPrinter.kt new file mode 100644 index 000000000..6fe782020 --- /dev/null +++ b/app/src/dev/java/exh/log/CrashlyticsPrinter.kt @@ -0,0 +1,14 @@ +package exh.log + +import com.elvishew.xlog.printer.Printer + +class CrashlyticsPrinter(private val logLevel: Int) : Printer { + /** + * Print log in new line. + * + * @param logLevel the level of log + * @param tag the tag of log + * @param msg the msg of log + */ + override fun println(logLevel: Int, tag: String?, msg: String?) = Unit +} diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 9e7d156fc..7b9e811ab 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -51,8 +51,6 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior import cafe.adriel.voyager.navigator.currentOrThrow -import com.google.firebase.Firebase -import com.google.firebase.analytics.analytics import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.sync.SyncPreferences import eu.kanade.presentation.components.AppStateBanners @@ -87,7 +85,6 @@ import eu.kanade.tachiyomi.ui.manga.MangaScreen import eu.kanade.tachiyomi.ui.more.NewUpdateScreen import eu.kanade.tachiyomi.ui.more.OnboardingScreen import eu.kanade.tachiyomi.util.system.dpToPx -import eu.kanade.tachiyomi.util.system.isDevFlavor import eu.kanade.tachiyomi.util.system.isNavigationBarNeedsScrim import eu.kanade.tachiyomi.util.system.isPreviewBuildType import eu.kanade.tachiyomi.util.system.isReleaseBuildType @@ -183,7 +180,6 @@ class MainActivity : BaseActivity() { super.onCreate(savedInstanceState) val didMigration = if (isLaunch) { - addAnalytics() Migrator.awaitAndRelease() } else { false @@ -595,14 +591,6 @@ class MainActivity : BaseActivity() { return true } - // SY --> - private fun addAnalytics() { - if (!isDevFlavor && (isPreviewBuildType)) { - Firebase.analytics.setUserProperty("preview_version", BuildConfig.COMMIT_COUNT) - } - } - // SY <-- - companion object { const val INTENT_SEARCH = "eu.kanade.tachiyomi.SEARCH" const val INTENT_SEARCH_QUERY = "query" diff --git a/app/src/main/java/exh/log/CrashlyticsPrinter.kt b/app/src/standard/java/exh/log/CrashlyticsPrinter.kt similarity index 100% rename from app/src/main/java/exh/log/CrashlyticsPrinter.kt rename to app/src/standard/java/exh/log/CrashlyticsPrinter.kt diff --git a/app/src/standard/java/mihon/core/firebase/FirebaseConfig.kt b/app/src/standard/java/mihon/core/firebase/FirebaseConfig.kt index c94436332..99f93c4ce 100644 --- a/app/src/standard/java/mihon/core/firebase/FirebaseConfig.kt +++ b/app/src/standard/java/mihon/core/firebase/FirebaseConfig.kt @@ -4,6 +4,8 @@ import android.content.Context import com.google.firebase.FirebaseApp import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.crashlytics.FirebaseCrashlytics +import eu.kanade.tachiyomi.BuildConfig +import eu.kanade.tachiyomi.util.system.isPreviewBuildType object FirebaseConfig { private lateinit var analytics: FirebaseAnalytics @@ -13,6 +15,11 @@ object FirebaseConfig { analytics = FirebaseAnalytics.getInstance(context) FirebaseApp.initializeApp(context) crashlytics = FirebaseCrashlytics.getInstance() + // KMK --> + if (isPreviewBuildType) { + analytics.setUserProperty("preview_version", BuildConfig.COMMIT_COUNT) + } + // KMK <-- } fun setAnalyticsEnabled(enabled: Boolean) {