From b5fb64b70e7c24951e53d516c7910690ced244e6 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 16 Apr 2023 17:13:00 -0400 Subject: [PATCH] Directly use shortcuts and update google services and firebase --- app/build.gradle.kts | 4 ++-- app/src/main/java/eu/kanade/tachiyomi/App.kt | 10 ---------- .../eu/kanade/tachiyomi/ui/main/MainActivity.kt | 13 +++++++++++++ app/src/main/java/exh/log/CrashlyticsPrinter.kt | 5 +++-- app/{ => src/main/res/xml}/shortcuts.xml | 4 ++++ build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- gradle/sy.versions.toml | 6 +++--- 8 files changed, 27 insertions(+), 19 deletions(-) rename app/{ => src/main/res/xml}/shortcuts.xml (90%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e3ad10b39..53a58246a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,7 +7,7 @@ plugins { kotlin("android") kotlin("plugin.parcelize") kotlin("plugin.serialization") - id("com.github.zellius.shortcut-helper") + //id("com.github.zellius.shortcut-helper") id("com.github.ben-manes.versions") } @@ -17,7 +17,7 @@ if (gradle.startParameter.taskRequests.toString().contains("Standard")) { apply(plugin = "com.google.firebase.crashlytics") } -shortcutHelper.setFilePath("./shortcuts.xml") +//shortcutHelper.setFilePath("./shortcuts.xml") val SUPPORTED_ABIS = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64") diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index b8a44c850..e80ab9ede 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/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() } 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 07864ec32..b39e88f22 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/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 diff --git a/app/src/main/java/exh/log/CrashlyticsPrinter.kt b/app/src/main/java/exh/log/CrashlyticsPrinter.kt index 5d42a8179..e813a28a4 100644 --- a/app/src/main/java/exh/log/CrashlyticsPrinter.kt +++ b/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 diff --git a/app/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml similarity index 90% rename from app/shortcuts.xml rename to app/src/main/res/xml/shortcuts.xml index b9e38f27c..64737f58b 100644 --- a/app/shortcuts.xml +++ b/app/src/main/res/xml/shortcuts.xml @@ -9,6 +9,7 @@ android:shortcutShortLabel="@string/label_library"> diff --git a/build.gradle.kts b/build.gradle.kts index 2886c079f..22a17ae3a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile buildscript { dependencies { - classpath(libs.android.shortcut.gradle) + // classpath(libs.android.shortcut.gradle) classpath(libs.google.services.gradle) classpath(libs.aboutLibraries.gradle) classpath(libs.sqldelight.gradle) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b7c380dda..eaa5a9688 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ richtext = "0.16.0" [libraries] desugar = "com.android.tools:desugar_jdk_libs:2.0.3" android-shortcut-gradle = "com.github.zellius:android-shortcut-gradle-plugin:0.1.2" -google-services-gradle = "com.google.gms:google-services:4.3.10" +google-services-gradle = "com.google.gms:google-services:4.3.15" rxandroid = "io.reactivex:rxandroid:1.2.1" rxjava = "io.reactivex:rxjava:1.3.8" diff --git a/gradle/sy.versions.toml b/gradle/sy.versions.toml index aebb22d77..eed4e3053 100644 --- a/gradle/sy.versions.toml +++ b/gradle/sy.versions.toml @@ -1,9 +1,9 @@ [versions] [libraries] -firebase-analytics = "com.google.firebase:firebase-analytics-ktx:21.0.0" -firebase-crashlytics-ktx = "com.google.firebase:firebase-crashlytics-ktx:18.2.11" -firebase-crashlytics-gradle = "com.google.firebase:firebase-crashlytics-gradle:2.8.0" +firebase-analytics = "com.google.firebase:firebase-analytics-ktx:21.2.2" +firebase-crashlytics-ktx = "com.google.firebase:firebase-crashlytics-ktx:18.3.6" +firebase-crashlytics-gradle = "com.google.firebase:firebase-crashlytics-gradle:2.9.5" simularity = "info.debatty:java-string-similarity:2.0.0" xlog = "com.elvishew:xlog:1.11.0"