Merge pull request #7938 from brave/pr7896_update_brave_shields_icon_…

…behaviour_android_1.21.x Brave shields button behaviour (uplift to 1.21.x)
brave · Feb 15, 2021 · 1609057 · 1609057
2 parents 6fc3712 + 22020ab
commit 1609057
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
@@ -352,9 +352,9 @@ public void onPageLoadFinished(final Tab tab, String url) {
                                 getContext(), RetentionNotificationUtil.BRAVE_STATS_TIME);
                         OnboardingPrefManager.getInstance().setTimeSavedNotificationStarted(true);
                     }
-                    if (mBraveShieldsButton != null && mBraveShieldsHandler != null
-                        && !mBraveShieldsHandler.isShowing()) {
-                      checkForTooltip(tab);
+                    if (mBraveShieldsButton != null && mBraveShieldsButton.isShown()
+                            && mBraveShieldsHandler != null && !mBraveShieldsHandler.isShowing()) {
+                        checkForTooltip(tab);
                     }
                 }
             }
@@ -404,29 +404,25 @@ private void checkForTooltip(Tab tab) {
                     && mBraveShieldsHandler.getTackersBlockedCount(tab.getId())
                                     + mBraveShieldsHandler.getAdsBlockedCount(tab.getId())
                             > 0) {
-                showTooltip(ShieldsTooltipEnum.ONE_TIME_ADS_TRACKER_BLOCKED_TOOLTIP);
-                BraveShieldsUtils.setShieldsTooltipShown(
-                        BraveShieldsUtils.PREF_SHIELDS_TOOLTIP, true);
+                showTooltip(ShieldsTooltipEnum.ONE_TIME_ADS_TRACKER_BLOCKED_TOOLTIP,
+                        BraveShieldsUtils.PREF_SHIELDS_TOOLTIP);
             } else if (!BraveShieldsUtils.hasShieldsTooltipShown(
                                BraveShieldsUtils.PREF_SHIELDS_VIDEO_ADS_BLOCKED_TOOLTIP)
                     && shouldShowVideoTooltip(tab.getUrlString())) {
-                showTooltip(ShieldsTooltipEnum.VIDEO_ADS_BLOCKED_TOOLTIP);
-                BraveShieldsUtils.setShieldsTooltipShown(
-                        BraveShieldsUtils.PREF_SHIELDS_VIDEO_ADS_BLOCKED_TOOLTIP, true);
+                showTooltip(ShieldsTooltipEnum.VIDEO_ADS_BLOCKED_TOOLTIP,
+                        BraveShieldsUtils.PREF_SHIELDS_VIDEO_ADS_BLOCKED_TOOLTIP);
             } else if (!BraveShieldsUtils.hasShieldsTooltipShown(
                                BraveShieldsUtils.PREF_SHIELDS_ADS_TRACKER_BLOCKED_TOOLTIP)
                     && mBraveShieldsHandler.getTackersBlockedCount(tab.getId())
                                     + mBraveShieldsHandler.getAdsBlockedCount(tab.getId())
                             > 10) {
-                showTooltip(ShieldsTooltipEnum.ADS_TRACKER_BLOCKED_TOOLTIP);
-                BraveShieldsUtils.setShieldsTooltipShown(
-                        BraveShieldsUtils.PREF_SHIELDS_ADS_TRACKER_BLOCKED_TOOLTIP, true);
+                showTooltip(ShieldsTooltipEnum.ADS_TRACKER_BLOCKED_TOOLTIP,
+                        BraveShieldsUtils.PREF_SHIELDS_ADS_TRACKER_BLOCKED_TOOLTIP);
             } else if (!BraveShieldsUtils.hasShieldsTooltipShown(
                                BraveShieldsUtils.PREF_SHIELDS_HTTPS_UPGRADE_TOOLTIP)
                     && mBraveShieldsHandler.getHttpsUpgradeCount(tab.getId()) > 0) {
-                showTooltip(ShieldsTooltipEnum.HTTPS_UPGRADE_TOOLTIP);
-                BraveShieldsUtils.setShieldsTooltipShown(
-                        BraveShieldsUtils.PREF_SHIELDS_HTTPS_UPGRADE_TOOLTIP, true);
+                showTooltip(ShieldsTooltipEnum.HTTPS_UPGRADE_TOOLTIP,
+                        BraveShieldsUtils.PREF_SHIELDS_HTTPS_UPGRADE_TOOLTIP);
             }
         }
     }
@@ -454,7 +450,7 @@ private boolean shouldShowVideoTooltip(String tabUrl) {
         }
     }
 
-    private void showTooltip(ShieldsTooltipEnum shieldsTooltipEnum) {
+    private void showTooltip(ShieldsTooltipEnum shieldsTooltipEnum, String tooltipPref) {
         mShieldsPopupWindowTooltip =
                 new PopupWindowTooltip.Builder(getContext())
                         .anchorView(mBraveShieldsButton)
@@ -494,8 +490,11 @@ public void onClick(View view) {
         TextView tooltipText = mShieldsPopupWindowTooltip.findViewById(R.id.txt_tooltip_text);
         tooltipText.setText(getContext().getResources().getString(shieldsTooltipEnum.getText()));
 
-        mShieldsPopupWindowTooltip.show();
-        BraveShieldsUtils.isTooltipShown = true;
+        if (mBraveShieldsButton != null && mBraveShieldsButton.isShown()) {
+            mShieldsPopupWindowTooltip.show();
+            BraveShieldsUtils.setShieldsTooltipShown(tooltipPref, true);
+            BraveShieldsUtils.isTooltipShown = true;
+        }
     }
 
     public void dismissShieldsTooltip() {