diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 0e6345dee..d0cff3054 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -32,7 +32,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 43ddb25a5..1b6071928 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,7 +11,7 @@ plugins { alias(libs.plugins.aboutLibraries) } -if (Config.includeAnalytics) { +if (Config.includeTelemetry) { pluginManager.apply { apply(libs.plugins.google.services.get().pluginId) apply(libs.plugins.firebase.crashlytics.get().pluginId) @@ -32,7 +32,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 4cf85873c..ff4285ff4 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.presentation.core.i18n.stringResource import tachiyomi.presentation.core.util.collectAsState @@ -118,7 +118,7 @@ internal class PermissionStep : OnboardingStep { }, ) - 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 c06d4a06b..ad57327d1 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 @@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.core.security.PrivacyPreferences import eu.kanade.tachiyomi.core.security.SecurityPreferences 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 tachiyomi.core.common.i18n.stringResource @@ -34,7 +34,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/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 6a1e83f7d..b847d5f9d 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)