From b318282ebd144053622bab98f53cd09c6ed1eb4c Mon Sep 17 00:00:00 2001 From: Deep Date: Tue, 9 Feb 2021 11:43:14 -0500 Subject: [PATCH 1/2] Check for shields button --- .../chrome/browser/toolbar/top/BraveToolbarLayout.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 index 8883825e5a4c..bd0bbe9cf26f 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -354,9 +354,9 @@ public void onPageLoadFinished(final Tab tab, GURL 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); } } } From 1257f5c3651947c42b9b264e03a23028264083ec Mon Sep 17 00:00:00 2001 From: Deep Date: Thu, 11 Feb 2021 00:20:37 -0500 Subject: [PATCH 2/2] Update tooltip behavior --- .../toolbar/top/BraveToolbarLayout.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 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 index bd0bbe9cf26f..ff518dda3774 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -406,29 +406,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); } } } @@ -456,7 +452,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) @@ -496,8 +492,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 showRewardsTooltip() {