Uplift of #13453 (squashed) to beta

brave · Jun 2, 2022 · 958356c · 958356c
1 parent 44cffed
commit 958356c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
@@ -738,7 +738,7 @@ private void refreshFeed() {
 
     private void keepPosition(int prevScrollPosition, int prevRecyclerViewPosition,
             int prevRecyclerViewItemPosition) {
-        if (!mIsNewsOn || !mIsShowNewsOn || (mIsNewsOn && mIsShowOptin)) {
+        if (!mIsNewsOn || !mIsShowNewsOn || (mIsNewsOn && mIsShowOptin && !mIsShowNewsOn)) {
             return;
         }
         processFeed();
@@ -1363,6 +1363,8 @@ public void onClick(View v) {
                     sharedPreferencesEditor.apply();
                     BravePrefServiceBridge.getInstance().setNewsOptIn(true);
                     BravePrefServiceBridge.getInstance().setShowNews(true);
+                    mIsNewsOn = BravePrefServiceBridge.getInstance().getNewsOptIn();
+                    mIsShowNewsOn = BravePrefServiceBridge.getInstance().getShowNews();
                     if (BraveActivity.getBraveActivity() != null) {
                         BraveActivity.getBraveActivity().inflateNewsSettingsBar();
                         mSettingsBar =