From 1b896134a0180b34ecbe3244ed56d768e1883b08 Mon Sep 17 00:00:00 2001
From: deeppandya <deeppandya91@gmail.com>
Date: Thu, 10 Aug 2023 16:31:30 -0400
Subject: [PATCH] Update cookie consent checks

---
 .../settings/BravePrivacySettings.java        |  8 --------
 .../toolbar/top/BraveToolbarLayoutImpl.java   | 20 +++++--------------
 2 files changed, 5 insertions(+), 23 deletions(-)

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 333f28742e7..bb2ed3a6565 100644
--- a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
+++ b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
@@ -388,14 +388,6 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
             }
         }
 
-        // 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 f2ce770231c..4775c2987f5 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java
@@ -941,21 +941,11 @@ 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();
-            //                 }
-            //             });
-            // });
+        if (SharedPreferencesManager.getInstance().readBoolean(
+                    BravePreferenceKeys.SHOULD_SHOW_COOKIE_CONSENT_NOTICE, true)
+                && SharedPreferencesManager.getInstance().readInt(
+                           BravePreferenceKeys.LOADED_SITE_COUNT, 0)
+                        > 5) {
             showCookieConsentTooltip();
         }
     }