From 0df53a5125aa714f3f444a13a6e87ba035eaedda Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Wed, 19 Mar 2025 15:03:03 +0600 Subject: [PATCH] Change 'include-analytics' to 'include-telemetry' (mihonapp/mihon#1874) (cherry picked from commit 093e8e5c5afe970d5aa2f1c237d43ac7936256b2) --- .github/workflows/build_preview.yml | 4 ++-- .github/workflows/build_push.yml | 2 +- .github/workflows/build_release.yml | 2 +- app/build.gradle.kts | 4 ++-- .../eu/kanade/presentation/more/onboarding/PermissionStep.kt | 4 ++-- .../more/settings/screen/SettingsSecurityScreen.kt | 4 ++-- app/src/main/java/eu/kanade/tachiyomi/App.kt | 4 ++-- .../main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt | 4 ++-- buildSrc/src/main/kotlin/mihon/buildlogic/BuildConfig.kt | 4 ++-- telemetry/build.gradle.kts | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build_preview.yml b/.github/workflows/build_preview.yml index 79b7794ff..8fbc9207e 100644 --- a/.github/workflows/build_preview.yml +++ b/.github/workflows/build_preview.yml @@ -151,7 +151,7 @@ jobs: run: ./gradlew spotlessCheck - name: Build app - run: ./gradlew assemblePreview -Pinclude-analytics -Penable-updater + run: ./gradlew assemblePreview -Pinclude-telemetry -Penable-updater - name: Run unit tests run: ./gradlew testReleaseUnitTest @@ -183,7 +183,7 @@ jobs: keyPassword: ${{ secrets.KEY_PASSWORD }} env: BUILD_TOOLS_VERSION: '35.0.1' - + - name: Get SHA & clean up build artifacts id: get_sha run: | diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index ebcec868f..a3265b7e8 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -68,7 +68,7 @@ jobs: run: ./gradlew spotlessCheck - name: Build app - run: ./gradlew assembleRelease -Pinclude-analytics -Penable-updater + run: ./gradlew assembleRelease -Pinclude-telemetry -Penable-updater - name: Run unit tests run: ./gradlew testReleaseUnitTest diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 0e1f09b25..31a082fce 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -124,7 +124,7 @@ jobs: run: ./gradlew spotlessCheck - name: Build app - run: ./gradlew assembleRelease -Pinclude-analytics -Penable-updater + run: ./gradlew assembleRelease -Pinclude-telemetry -Penable-updater - name: Run unit tests run: ./gradlew testReleaseUnitTest diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c0ba0eb8f..cb88ff1cd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,7 +12,7 @@ plugins { id("com.github.ben-manes.versions") } -if (Config.includeAnalytics) { +if (Config.includeTelemetry) { pluginManager.apply { apply(libs.plugins.google.services.get().pluginId) apply(libs.plugins.firebase.crashlytics.get().pluginId) @@ -31,7 +31,7 @@ android { buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"") buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"") buildConfigField("String", "BUILD_TIME", "\"${getBuildTime()}\"") - buildConfigField("boolean", "ANALYTICS_INCLUDED", "${Config.includeAnalytics}") + buildConfigField("boolean", "TELEMETRY_INCLUDED", "${Config.includeTelemetry}") buildConfigField("boolean", "UPDATER_ENABLED", "${Config.enableUpdater}") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt b/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt index fda849088..c7e8bd8ae 100644 --- a/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt +++ b/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt @@ -37,8 +37,8 @@ import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.compose.LocalLifecycleOwner import eu.kanade.presentation.util.rememberRequestPackageInstallsPermissionState import eu.kanade.tachiyomi.core.security.PrivacyPreferences -import eu.kanade.tachiyomi.util.system.analyticsIncluded import eu.kanade.tachiyomi.util.system.launchRequestPackageInstallsPermission +import eu.kanade.tachiyomi.util.system.telemetryIncluded import tachiyomi.i18n.MR import tachiyomi.i18n.kmk.KMR import tachiyomi.presentation.core.i18n.stringResource @@ -178,7 +178,7 @@ internal class PermissionStep : OnboardingStep { } // KMK <-- - if (!analyticsIncluded) return@Column + if (!telemetryIncluded) return@Column HorizontalDivider( modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp), diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt index 0cfa36bee..9df011f14 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt @@ -51,7 +51,7 @@ import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesScreen import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.authenticate import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.isAuthenticationSupported -import eu.kanade.tachiyomi.util.system.analyticsIncluded +import eu.kanade.tachiyomi.util.system.telemetryIncluded import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableMap import mihon.core.archive.CbzCrypto @@ -77,7 +77,7 @@ object SettingsSecurityScreen : SearchableSettings { val privacyPreferences = remember { Injekt.get() } return buildList(2) { add(getSecurityGroup(securityPreferences)) - if (!analyticsIncluded) return@buildList + if (!telemetryIncluded) return@buildList add(getFirebaseGroup(privacyPreferences)) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index 59bceea45..a19dbd189 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -62,11 +62,11 @@ import eu.kanade.tachiyomi.util.CrashLogUtil import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.GLUtil import eu.kanade.tachiyomi.util.system.WebViewUtil -import eu.kanade.tachiyomi.util.system.analyticsIncluded import eu.kanade.tachiyomi.util.system.animatorDurationScale import eu.kanade.tachiyomi.util.system.cancelNotification import eu.kanade.tachiyomi.util.system.isDebugBuildType import eu.kanade.tachiyomi.util.system.notify +import eu.kanade.tachiyomi.util.system.telemetryIncluded import exh.log.CrashlyticsPrinter import exh.log.EHLogLevel import exh.log.EnhancedFilePrinter @@ -350,7 +350,7 @@ class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factor } // Install Crashlytics in prod - if (analyticsIncluded) { + if (telemetryIncluded) { printers += CrashlyticsPrinter(LogLevel.ERROR) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt index dfe8a4a9e..471f4de34 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt @@ -4,8 +4,8 @@ package eu.kanade.tachiyomi.util.system import eu.kanade.tachiyomi.BuildConfig -val analyticsIncluded: Boolean - inline get() = BuildConfig.ANALYTICS_INCLUDED +val telemetryIncluded: Boolean + inline get() = BuildConfig.TELEMETRY_INCLUDED val updaterEnabled: Boolean inline get() = BuildConfig.UPDATER_ENABLED diff --git a/buildSrc/src/main/kotlin/mihon/buildlogic/BuildConfig.kt b/buildSrc/src/main/kotlin/mihon/buildlogic/BuildConfig.kt index cb608a460..9e16cb217 100644 --- a/buildSrc/src/main/kotlin/mihon/buildlogic/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/mihon/buildlogic/BuildConfig.kt @@ -3,14 +3,14 @@ package mihon.buildlogic import org.gradle.api.Project interface BuildConfig { - val includeAnalytics: Boolean + val includeTelemetry: Boolean val enableUpdater: Boolean val enableCodeShrink: Boolean val includeDependencyInfo: Boolean } val Project.Config: BuildConfig get() = object : BuildConfig { - override val includeAnalytics: Boolean = project.hasProperty("include-analytics") + override val includeTelemetry: Boolean = project.hasProperty("include-telemetry") override val enableUpdater: Boolean = project.hasProperty("enable-updater") override val enableCodeShrink: Boolean = !project.hasProperty("disable-code-shrink") override val includeDependencyInfo: Boolean = project.hasProperty("include-dependency-info") diff --git a/telemetry/build.gradle.kts b/telemetry/build.gradle.kts index 1382b9324..2e039c063 100644 --- a/telemetry/build.gradle.kts +++ b/telemetry/build.gradle.kts @@ -10,7 +10,7 @@ android { sourceSets { getByName("main") { - val dir = if (Config.includeAnalytics) "firebase" else "noop" + val dir = if (Config.includeTelemetry) "firebase" else "noop" kotlin.srcDirs("src/$dir/kotlin") manifest.srcFile("src/$dir/AndroidManifext.xml") } @@ -18,7 +18,7 @@ android { } dependencies { - if (Config.includeAnalytics) { + if (Config.includeTelemetry) { implementation(platform(libs.firebase.bom)) implementation(libs.firebase.analytics) implementation(libs.firebase.crashlytics)