Uplift of #16617 (squashed) to release

brave · Jan 11, 2023 · 48706e7 · 48706e7
1 parent 1659e3e
commit 48706e7
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
@@ -295,20 +295,21 @@ protected void onAttachedToWindow() {
         }
         if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_NEWS)) {
             initBraveNewsController();
-            if (BraveActivity.getBraveActivity() != null
-                    && BravePrefServiceBridge.getInstance().getNewsOptIn()) {
+            if (BravePrefServiceBridge.getInstance().getNewsOptIn()) {
                 new Handler(Looper.getMainLooper()).post(() -> {
-                    Tab tab = BraveActivity.getBraveActivity().getActivityTab();
-                    if (tab != null && tab.getUrl().getSpec() != null
-                            && UrlUtilities.isNTPUrl(tab.getUrl().getSpec())) {
-                        // purges display ads on tab change
-                        if (BraveActivity.getBraveActivity().getLastTabId() != tab.getId()) {
-                            if (mBraveNewsController != null) {
-                                mBraveNewsController.onDisplayAdPurgeOrphanedEvents();
+                    if (BraveActivity.getBraveActivity() != null) {
+                        Tab tab = BraveActivity.getBraveActivity().getActivityTab();
+                        if (tab != null && tab.getUrl().getSpec() != null
+                                && UrlUtilities.isNTPUrl(tab.getUrl().getSpec())) {
+                            // purges display ads on tab change
+                            if (BraveActivity.getBraveActivity().getLastTabId() != tab.getId()) {
+                                if (mBraveNewsController != null) {
+                                    mBraveNewsController.onDisplayAdPurgeOrphanedEvents();
+                                }
                             }
-                        }
 
-                        BraveActivity.getBraveActivity().setLastTabId(tab.getId());
+                            BraveActivity.getBraveActivity().setLastTabId(tab.getId());
+                        }
                     }
                 });
             }