Bug 40021: Force telemetry=false in Fennec settings migration (9afb620c) · Commits · The Tor Project / Applications / android-components

components/support/migration/src/main/java/mozilla/components/support/migration/FennecMigrator.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ sealed class Migration(val currentVersion: Int) {
		/**
		* Migrates all Fennec settings backed by SharedPreferences.
		*/
		object Settings : Migration(currentVersion = 2)
		object Settings : Migration(currentVersion = 3)

		/**
		* Migrates / Disables all currently unsupported Add-ons.

+2 −7

Original line number	Diff line number	Diff line
		@@ -44,16 +44,11 @@ internal object FennecSettingsMigration {
		return migrateTelemetryOptInStatus(fennecAppPrefs, fenixAppPrefs)
		}

		@Suppress("UNUSED_PARAMETER")
		private fun migrateTelemetryOptInStatus(
		fennecPrefs: SharedPreferences,
		fenixPrefs: SharedPreferences
		): Result<SettingsMigrationResult> {
		// Sanity check: make sure we actually have an FHR value set.
		if (!fennecPrefs.contains(FENNEC_PREFS_FHR_KEY)) {
		logger.warn("Missing FHR pref value")
		return Result.Failure(SettingsMigrationException(SettingsMigrationResult.Failure.MissingFHRPrefValue))
		}

		// Fennec has two telemetry settings:
		// - Firefox Health Report (FHR) - defaults to 'on',
		// - Telemetry - defaults to 'off'.
		@@ -66,7 +61,7 @@ internal object FennecSettingsMigration {
		// If FHR is disabled by the user, we'll disable telemetry in Fenix. Otherwise, it will be enabled.

		// Read Fennec prefs.
		val fennecFHRState = fennecPrefs.getBoolean(FENNEC_PREFS_FHR_KEY, false)
		val fennecFHRState = false
		logger.info("Fennec FHR state is: $fennecFHRState")

		// Update Fenix prefs.