Merge pull request #12817 from brave/bravenews_settings_header_fix_an…

…droid [Android] Fix Bravenews settings header
brave · Mar 31, 2022 · 9478b3c · 9478b3c
2 parents 28a3664 + 3e40759
commit 9478b3c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
@@ -29,7 +29,6 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;

diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
@@ -394,24 +394,27 @@ protected void onAttachedToWindow() {
             initNews();
 
             if (BraveActivity.getBraveActivity() != null && mIsNewsOn) {
-                Tab tab = BraveActivity.getBraveActivity().getActivityTab();
-                if (tab != null && tab.getUrl().getSpec() != null
-                        && UrlUtilities.isNTPUrl(tab.getUrl().getSpec())) {
-                    BraveActivity.getBraveActivity().inflateNewsSettingsBar();
-                    mSettingsBar =
-                            (LinearLayout) mCompositorView.findViewById(R.id.news_settings_bar);
-                    if (mSettingsBar != null) {
-                        mSettingsBar.setVisibility(View.VISIBLE);
-                    }
-                    mNewContentButton = (RelativeLayout) mCompositorView.findViewById(
-                            R.id.new_content_layout_id);
-                } else {
-                    if (tab != null) {
-                    }
-                    if (!mComesFromNewTab) {
-                        BraveActivity.getBraveActivity().removeSettingsBar();
+                new Handler().post(() -> {
+                    Tab tab = BraveActivity.getBraveActivity().getActivityTab();
+
+                    if (tab != null && tab.getUrl().getSpec() != null
+                            && UrlUtilities.isNTPUrl(tab.getUrl().getSpec())) {
+                        BraveActivity.getBraveActivity().inflateNewsSettingsBar();
+                        mSettingsBar =
+                                (LinearLayout) mCompositorView.findViewById(R.id.news_settings_bar);
+                        if (mSettingsBar != null) {
+                            mSettingsBar.setVisibility(View.VISIBLE);
+                        }
+                        mNewContentButton = (RelativeLayout) mCompositorView.findViewById(
+                                R.id.new_content_layout_id);
+                    } else {
+                        if (tab != null) {
+                        }
+                        if (!mComesFromNewTab) {
+                            BraveActivity.getBraveActivity().removeSettingsBar();
+                        }
                     }
-                }
+                });
             }
             initPreferenceObserver();
             if (mPreferenceObserver != null) {
@@ -438,6 +441,13 @@ private void initPreferenceObserver() {
                         BraveActivity.getBraveActivity().inflateNewsSettingsBar();
                     }
                 }
+                mIsNewsOn = BravePrefServiceBridge.getInstance().getNewsOptIn();
+                mSettingsBar = (LinearLayout) mCompositorView.findViewById(R.id.news_settings_bar);
+                if (mSettingsBar != null) {
+                    mSettingsBar.setVisibility(View.VISIBLE);
+                }
+                mNewContentButton =
+                        (RelativeLayout) mCompositorView.findViewById(R.id.new_content_layout_id);
                 refreshFeed();
             } else if (TextUtils.equals(key, BravePreferenceKeys.BRAVE_NEWS_PREF_TURN_ON_NEWS)) {
                 mIsNewsOn = BravePrefServiceBridge.getInstance().getNewsOptIn();