1
0
Fork 0

For #4674 - Adds marketing data as a collection choice

master
Jeff Boek 3 years ago committed by Mihai Adrian
parent 5839f5891c
commit 9f3faa43fe
  1. 2
      app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt
  2. 3
      app/src/main/java/org/mozilla/fenix/components/metrics/LeanplumMetricsService.kt
  3. 9
      app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
  4. 5
      app/src/main/java/org/mozilla/fenix/utils/Settings.kt
  5. 1
      app/src/main/res/values/preference_keys.xml
  6. 5
      app/src/main/res/xml/data_choices_preferences.xml

@ -18,6 +18,8 @@ import org.mozilla.fenix.ext.settings
class AdjustMetricsService(private val application: Application) : MetricsService {
override fun start() {
if (!application.settings().isMarketingTelemetryEnabled) return
if ((BuildConfig.ADJUST_TOKEN.isNullOrBlank())) {
Log.i(LOGTAG, "No adjust token defined")

@ -56,6 +56,8 @@ class LeanplumMetricsService(private val application: Application) : MetricsServ
private val token = Token(LeanplumId, LeanplumToken)
override fun start() {
if (!application.settings().isMarketingTelemetryEnabled) return
val applicationSetLocale = LocaleManager.getCurrentLocale(application)
val currentLocale = when (applicationSetLocale != null) {
true -> applicationSetLocale.isO3Language
@ -96,6 +98,7 @@ class LeanplumMetricsService(private val application: Application) : MetricsServ
}
override fun stop() {
if (application.settings().isMarketingTelemetryEnabled) return
// As written in LeanPlum SDK documentation, "This prevents Leanplum from communicating with the server."
// as this "isTestMode" flag is checked before LeanPlum SDK does anything.
// Also has the benefit effect of blocking the display of already downloaded messages.

@ -51,6 +51,15 @@ class DataChoicesFragment : PreferenceFragmentCompat() {
onPreferenceChangeListener = SharedPreferenceUpdater()
}
findPreference<SwitchPreference>(getPreferenceKey(R.string.pref_key_telemetry))?.apply {
isChecked = context.settings().isMarketingTelemetryEnabled
val appName = context.getString(R.string.app_name)
summary = context.getString(R.string.preferences_marketing_data_description, appName)
onPreferenceChangeListener = SharedPreferenceUpdater()
}
findPreference<SwitchPreference>(getPreferenceKey(R.string.pref_key_experimentation))?.apply {
isChecked = context.settings().isExperimentationEnabled
isVisible = Config.channel.isReleaseOrBeta

@ -122,6 +122,11 @@ class Settings private constructor(
default = true
)
val isMarketingTelemetryEnabled by booleanPreference(
appContext.getPreferenceKey(R.string.pref_key_marketing_telemetry),
default = true
)
val isExperimentationEnabled by booleanPreference(
appContext.getPreferenceKey(R.string.pref_key_experimentation),
default = true

@ -49,6 +49,7 @@
<!-- Data Choices -->
<string name="pref_key_telemetry" translatable="false">pref_key_telemetry</string>
<string name="pref_key_marketing_telemetry" translatable="false">pref_key_marketing_telemetry</string>
<string name="pref_key_crash_reporter" translatable="false">pref_key_crash_reporter</string>
<string name="pref_key_mozilla_location_service" translatable="false">pref_key_mozilla_location_service</string>
<string name="pref_key_fenix_health_report" translatable="false">pref_key_fenix_health_report</string>

@ -9,6 +9,11 @@
android:summary="@string/preferences_usage_data_description"
android:title="@string/preference_usage_data"
app:iconSpaceReserved="false" />
<androidx.preference.SwitchPreference
android:key="@string/pref_key_marketing_telemetry"
android:summary="@string/preferences_marketing_data_description"
android:title="@string/preferences_marketing_data"
app:iconSpaceReserved="false" />
<androidx.preference.SwitchPreference
android:key="@string/pref_key_experimentation"
android:summary="@string/preference_experiments_summary"

Loading…
Cancel
Save