diff --git a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java index c7a12a51f07..333f28742e7 100644 --- a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java +++ b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java @@ -388,13 +388,13 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE } } - if (mCookieListOptInPageAndroidHandler != null) { - mCookieListOptInPageAndroidHandler.shouldShowDialog(shouldShowDialog -> { - if (!shouldShowDialog) { - removePreferenceIfPresent(PREF_BLOCK_COOKIE_CONSENT_NOTICES); - } - }); - } + // if (mCookieListOptInPageAndroidHandler != null) { + // mCookieListOptInPageAndroidHandler.shouldShowDialog(shouldShowDialog -> { + // if (!shouldShowDialog) { + // removePreferenceIfPresent(PREF_BLOCK_COOKIE_CONSENT_NOTICES); + // } + // }); + // } updateBravePreferences(); } diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java index c4bd5de81a3..f2ce770231c 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java @@ -942,20 +942,21 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout private void maybeShowCookieConsentTooltip() { if (mCookieListOptInPageAndroidHandler != null && mFilterListAndroidHandler != null) { - mCookieListOptInPageAndroidHandler.shouldShowDialog(shouldShowDialog -> { - mFilterListAndroidHandler.isFilterListEnabled( - FilterListConstants.COOKIE_LIST_UUID, isEnabled -> { - if (!isEnabled && shouldShowDialog - && SharedPreferencesManager.getInstance().readBoolean( - BravePreferenceKeys.SHOULD_SHOW_COOKIE_CONSENT_NOTICE, - true) - && SharedPreferencesManager.getInstance().readInt( - BravePreferenceKeys.LOADED_SITE_COUNT, 0) - > 5) { - showCookieConsentTooltip(); - } - }); - }); + // mCookieListOptInPageAndroidHandler.shouldShowDialog(shouldShowDialog -> { + // mFilterListAndroidHandler.isFilterListEnabled( + // FilterListConstants.COOKIE_LIST_UUID, isEnabled -> { + // if (!isEnabled && shouldShowDialog + // && SharedPreferencesManager.getInstance().readBoolean( + // BravePreferenceKeys.SHOULD_SHOW_COOKIE_CONSENT_NOTICE, + // true) + // && SharedPreferencesManager.getInstance().readInt( + // BravePreferenceKeys.LOADED_SITE_COUNT, 0) + // > 5) { + // showCookieConsentTooltip(); + // } + // }); + // }); + showCookieConsentTooltip(); } } @@ -992,11 +993,8 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout btnAction.setOnClickListener((new View.OnClickListener() { @Override public void onClick(View v) { - if (mCookieListOptInPageAndroidHandler != null - && mFilterListAndroidHandler != null) { + if (mCookieListOptInPageAndroidHandler != null) { mCookieListOptInPageAndroidHandler.onTooltipYesClicked(); - mFilterListAndroidHandler.enableFilter( - FilterListConstants.COOKIE_LIST_UUID, true); } mCookieConsentTooltip.dismiss(); } @@ -1006,6 +1004,10 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout txtNoThanks.setOnClickListener((new View.OnClickListener() { @Override public void onClick(View v) { + if (mFilterListAndroidHandler != null) { + mFilterListAndroidHandler.enableFilter( + FilterListConstants.COOKIE_LIST_UUID, false); + } if (mCookieListOptInPageAndroidHandler != null) { mCookieListOptInPageAndroidHandler.onTooltipNoClicked(); } diff --git a/android/java/res/layout/block_cookie_consent_notices_tooltip.xml b/android/java/res/layout/block_cookie_consent_notices_tooltip.xml index 97760280c6d..32502b72394 100644 --- a/android/java/res/layout/block_cookie_consent_notices_tooltip.xml +++ b/android/java/res/layout/block_cookie_consent_notices_tooltip.xml @@ -70,7 +70,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="30dp" - android:text="@string/no_thanks" + android:text="@string/stop_blocking" android:textAlignment="center" android:textColor="@color/cookie_consent_action_color" android:textSize="14sp" /> diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd index 33efdded490..5802eea84de 100644 --- a/browser/ui/android/strings/android_brave_strings.grd +++ b/browser/ui/android/strings/android_brave_strings.grd @@ -3247,13 +3247,16 @@ If you don't accept this request, VPN will not reconnect and your internet conne Enter your Brave Wallet password - Block cookie notices + Got it + + + Stop blocking - Tired of cookie consent notices? + Brave is blocking cookie consent notices. - Brave already blocks third-party cookies. We can block cookie consent notices, too. + Brave already blocks harmful cookies. Now, we automatically block those annoying cookie consent notices, too. Note that Brave can't verify what will happen if you sign. A signature could authorize nearly any operation in your account or on your behalf, including (but not limited to) giving total control of your account and crypto assets to the site making the request. Only sign if you're sure you want to take this action, and trust the requesting site.