blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #8594: Show correct info in Etp settings info (#8687)

master
Mihai Adrian 2020-02-25 19:18:27 +02:00 committed by GitHub
parent 388c7017d8
commit beb323924b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt
View File

@ -149,7 +149,7 @@ class TrackingProtectionFragment : PreferenceFragmentCompat() {
R.id.trackingProtectionFragment,
TrackingProtectionFragmentDirections
.actionTrackingProtectionFragmentToTrackingProtectionBlockingFragment(
getString(R.string.preference_enhanced_tracking_protection_standard)
getString(R.string.preference_enhanced_tracking_protection_standard_option)
)
)
}

13
app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionBlockingFragment.kt
View File

@ -30,11 +30,14 @@ class TrackingProtectionBlockingFragment :
super.onViewCreated(view, savedInstanceState)
when (args.protectionMode) {
getString(R.string.preference_enhanced_tracking_protection_strict) -> {
category_fingerprinters.isVisible = true
category_tracking_content.isVisible = true
getString(R.string.preference_enhanced_tracking_protection_standard_option) -> {
category_fingerprinters.isVisible = false
category_tracking_content.isVisible = false
}
getString(R.string.preference_enhanced_tracking_protection_strict) -> return
getString(R.string.preference_enhanced_tracking_protection_custom) -> {
category_fingerprinters.isVisible =
requireContext().settings().blockFingerprintersInCustomTrackingProtection
@ -42,10 +45,10 @@ class TrackingProtectionBlockingFragment :
requireContext().settings().blockCryptominersInCustomTrackingProtection
category_cookies.isVisible =
requireContext().settings().blockCookiesInCustomTrackingProtection
category_tracking_content.isVisible =
requireContext().settings().blockTrackingContentInCustomTrackingProtection
}
getString(R.string.preference_enhanced_tracking_protection_standard) -> return
else -> return
}
}