From 2a99e9c69ebe845ccad66c617cb4bdf076d805e5 Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Wed, 25 Sep 2019 14:40:34 -0700
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/5312 - Send ETP
 Strict/Standard event

---
 .../fenix/settings/RadioButtonPreference.kt   |  1 +
 .../settings/TrackingProtectionFragment.kt    | 29 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/RadioButtonPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/RadioButtonPreference.kt
index 2bc54933b..327d67a34 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/RadioButtonPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/RadioButtonPreference.kt
@@ -97,6 +97,7 @@ open class RadioButtonPreference @JvmOverloads constructor(
         radioButton?.isChecked = isChecked
         context.settings().preferences.edit().putBoolean(key, isChecked)
             .apply()
+        onPreferenceChangeListener.onPreferenceChange(this, isChecked)
     }
 
     private fun bindRadioButton(holder: PreferenceViewHolder) {
diff --git a/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt
index 41f95d189..5c18fe5e9 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt
@@ -90,15 +90,17 @@ class TrackingProtectionFragment : PreferenceFragmentCompat() {
     private fun bindStrict() {
         val keyStrict = getString(R.string.pref_key_tracking_protection_strict)
         radioStrict = requireNotNull(findPreference(keyStrict))
-        radioStrict.onPreferenceChangeListener = SharedPreferenceUpdater()
         radioStrict.isVisible = FeatureFlags.etpCategories
         radioStrict.onPreferenceChangeListener = object : SharedPreferenceUpdater() {
             override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
-                context?.metrics?.track(
-                    Event.TrackingProtectionSettingChanged(
-                        Event.TrackingProtectionSettingChanged.Setting.STRICT
+                if (newValue == true) {
+                    updateTrackingProtectionPolicy()
+                    context?.metrics?.track(
+                        Event.TrackingProtectionSettingChanged(
+                            Event.TrackingProtectionSettingChanged.Setting.STRICT
+                        )
                     )
-                )
+                }
                 return super.onPreferenceChange(preference, newValue)
             }
         }
@@ -109,9 +111,6 @@ class TrackingProtectionFragment : PreferenceFragmentCompat() {
                     .actionTrackingProtectionFragmentToTrackingProtectionBlockingFragment(true)
             )
         }
-        radioStrict.onClickListener {
-            updateTrackingProtectionPolicy()
-        }
     }
 
     private fun bindStandard() {
@@ -120,11 +119,14 @@ class TrackingProtectionFragment : PreferenceFragmentCompat() {
         radioStandard.isVisible = FeatureFlags.etpCategories
         radioStandard.onPreferenceChangeListener = object : SharedPreferenceUpdater() {
             override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
-                context?.metrics?.track(
-                    Event.TrackingProtectionSettingChanged(
-                        Event.TrackingProtectionSettingChanged.Setting.STANDARD
+                if (newValue == true) {
+                    updateTrackingProtectionPolicy()
+                    context?.metrics?.track(
+                        Event.TrackingProtectionSettingChanged(
+                            Event.TrackingProtectionSettingChanged.Setting.STANDARD
+                        )
                     )
-                )
+                }
                 return super.onPreferenceChange(preference, newValue)
             }
         }
@@ -135,9 +137,6 @@ class TrackingProtectionFragment : PreferenceFragmentCompat() {
                     .actionTrackingProtectionFragmentToTrackingProtectionBlockingFragment(false)
             )
         }
-        radioStandard.onClickListener {
-            updateTrackingProtectionPolicy()
-        }
     }
 
     private fun updateTrackingProtectionPolicy() {