Uplift of #9240 (squashed) to beta

brave · Jun 30, 2021 · fcb8bb8 · fcb8bb8
1 parent 06fcf3a
commit fcb8bb8
Show file tree

Hide file tree

Showing 6 changed files with 181 additions and 156 deletions.
diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
@@ -478,7 +478,6 @@ private void checkForYandexSE() {
     private void checkForNotificationData() {
         Intent notifIntent = getIntent();
         if (notifIntent != null && notifIntent.getStringExtra(RetentionNotificationUtil.NOTIFICATION_TYPE) != null) {
-            Log.e("NTP", notifIntent.getStringExtra(RetentionNotificationUtil.NOTIFICATION_TYPE));
             String notificationType = notifIntent.getStringExtra(RetentionNotificationUtil.NOTIFICATION_TYPE);
             switch (notificationType) {
             case RetentionNotificationUtil.HOUR_3:

diff --git a/...oid/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java b/...oid/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java
@@ -95,6 +95,9 @@ public static void setShieldsValue(Profile profile, String host, String resource
             BraveShieldsContentSettingsJni.get().setFingerprintingControlType(settingOption, host, profile);
         } else if (resourceIndentifier.equals(RESOURCE_IDENTIFIER_COOKIES)) {
             BraveShieldsContentSettingsJni.get().setCookieControlType(settingOption, host, profile);
+        } else if (resourceIndentifier.equals(RESOURCE_IDENTIFIER_TRACKERS)) {
+            BraveShieldsContentSettingsJni.get().setCosmeticFilteringControlType(
+                    settingOption, host, profile);
         }
     }
 
@@ -119,6 +122,9 @@ public static String getShieldsValue(Profile profile, String host, String resour
             settings = BraveShieldsContentSettingsJni.get().getFingerprintingControlType(host, profile);
         } else if (resourceIndentifier.equals(RESOURCE_IDENTIFIER_COOKIES)) {
             settings = BraveShieldsContentSettingsJni.get().getCookieControlType(host, profile);
+        } else if (resourceIndentifier.equals(RESOURCE_IDENTIFIER_TRACKERS)) {
+            settings = BraveShieldsContentSettingsJni.get().getCosmeticFilteringControlType(
+                    host, profile);
         }
         return settings;
     }
@@ -160,5 +166,8 @@ interface Natives {
         boolean getHTTPSEverywhereEnabled(String url, Profile profile);
         void setNoScriptControlType(String type, String url, Profile profile);
         String getNoScriptControlType(String url, Profile profile);
+
+        void setCosmeticFilteringControlType(String type, String url, Profile profile);
+        String getCosmeticFilteringControlType(String url, Profile profile);
     }
 }