|
|
@ -90,15 +90,17 @@ class TrackingProtectionFragment : PreferenceFragmentCompat() {
|
|
|
|
private fun bindStrict() {
|
|
|
|
private fun bindStrict() {
|
|
|
|
val keyStrict = getString(R.string.pref_key_tracking_protection_strict)
|
|
|
|
val keyStrict = getString(R.string.pref_key_tracking_protection_strict)
|
|
|
|
radioStrict = requireNotNull(findPreference(keyStrict))
|
|
|
|
radioStrict = requireNotNull(findPreference(keyStrict))
|
|
|
|
radioStrict.onPreferenceChangeListener = SharedPreferenceUpdater()
|
|
|
|
|
|
|
|
radioStrict.isVisible = FeatureFlags.etpCategories
|
|
|
|
radioStrict.isVisible = FeatureFlags.etpCategories
|
|
|
|
radioStrict.onPreferenceChangeListener = object : SharedPreferenceUpdater() {
|
|
|
|
radioStrict.onPreferenceChangeListener = object : SharedPreferenceUpdater() {
|
|
|
|
override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
|
|
|
|
override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
|
|
|
|
context?.metrics?.track(
|
|
|
|
if (newValue == true) {
|
|
|
|
Event.TrackingProtectionSettingChanged(
|
|
|
|
updateTrackingProtectionPolicy()
|
|
|
|
Event.TrackingProtectionSettingChanged.Setting.STRICT
|
|
|
|
context?.metrics?.track(
|
|
|
|
|
|
|
|
Event.TrackingProtectionSettingChanged(
|
|
|
|
|
|
|
|
Event.TrackingProtectionSettingChanged.Setting.STRICT
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
return super.onPreferenceChange(preference, newValue)
|
|
|
|
return super.onPreferenceChange(preference, newValue)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -109,9 +111,6 @@ class TrackingProtectionFragment : PreferenceFragmentCompat() {
|
|
|
|
.actionTrackingProtectionFragmentToTrackingProtectionBlockingFragment(true)
|
|
|
|
.actionTrackingProtectionFragmentToTrackingProtectionBlockingFragment(true)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
radioStrict.onClickListener {
|
|
|
|
|
|
|
|
updateTrackingProtectionPolicy()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private fun bindStandard() {
|
|
|
|
private fun bindStandard() {
|
|
|
@ -120,11 +119,14 @@ class TrackingProtectionFragment : PreferenceFragmentCompat() {
|
|
|
|
radioStandard.isVisible = FeatureFlags.etpCategories
|
|
|
|
radioStandard.isVisible = FeatureFlags.etpCategories
|
|
|
|
radioStandard.onPreferenceChangeListener = object : SharedPreferenceUpdater() {
|
|
|
|
radioStandard.onPreferenceChangeListener = object : SharedPreferenceUpdater() {
|
|
|
|
override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
|
|
|
|
override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
|
|
|
|
context?.metrics?.track(
|
|
|
|
if (newValue == true) {
|
|
|
|
Event.TrackingProtectionSettingChanged(
|
|
|
|
updateTrackingProtectionPolicy()
|
|
|
|
Event.TrackingProtectionSettingChanged.Setting.STANDARD
|
|
|
|
context?.metrics?.track(
|
|
|
|
|
|
|
|
Event.TrackingProtectionSettingChanged(
|
|
|
|
|
|
|
|
Event.TrackingProtectionSettingChanged.Setting.STANDARD
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
return super.onPreferenceChange(preference, newValue)
|
|
|
|
return super.onPreferenceChange(preference, newValue)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -135,9 +137,6 @@ class TrackingProtectionFragment : PreferenceFragmentCompat() {
|
|
|
|
.actionTrackingProtectionFragmentToTrackingProtectionBlockingFragment(false)
|
|
|
|
.actionTrackingProtectionFragmentToTrackingProtectionBlockingFragment(false)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
radioStandard.onClickListener {
|
|
|
|
|
|
|
|
updateTrackingProtectionPolicy()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private fun updateTrackingProtectionPolicy() {
|
|
|
|
private fun updateTrackingProtectionPolicy() {
|
|
|
|