From beb323924be07e789db2ce2d6b5402760374106c Mon Sep 17 00:00:00 2001
From: Mihai Adrian <48995920+mcarare@users.noreply.github.com>
Date: Tue, 25 Feb 2020 19:18:27 +0200
Subject: [PATCH] For #8594: Show correct info in Etp settings info (#8687)

---
 .../fenix/settings/TrackingProtectionFragment.kt    |  2 +-
 .../TrackingProtectionBlockingFragment.kt           | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

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 f99dbdbb0..b5edd0758 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt
@@ -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)
                     )
             )
         }
diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionBlockingFragment.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionBlockingFragment.kt
index 10f512345..9e52c9625 100644
--- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionBlockingFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionBlockingFragment.kt
@@ -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
         }
     }