Re-organize calls sequence at P3aOnboardingActivity class

fixes brave/brave-browser#18825; fixes brave/brave-browser#18776;
brave · Oct 19, 2021 · 76c878e · 76c878e
1 parent 8c5ed63
commit 76c878e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/android/java/org/chromium/chrome/browser/firstrun/P3aOnboardingActivity.java b/android/java/org/chromium/chrome/browser/firstrun/P3aOnboardingActivity.java
@@ -24,6 +24,7 @@
 import androidx.annotation.NonNull;
 
 import org.chromium.base.Log;
+import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveRewardsHelper;
 import org.chromium.chrome.browser.app.BraveActivity;
@@ -36,13 +37,17 @@
 import org.chromium.chrome.browser.util.PackageUtils;
 
 public class P3aOnboardingActivity extends FirstRunActivityBase {
-    private boolean mNativeInitialized;
+    // mInitializeViewsDone and mInvokePostWorkAtInitializeViews are accessed
+    // from the same thread, so no need to use extra locks
+    private boolean mInitializeViewsDone;
+    private boolean mInvokePostWorkAtInitializeViews;
     private boolean mIsP3aEnabled;
     private FirstRunFlowSequencer mFirstRunFlowSequencer;
     private CheckBox mP3aOnboardingCheckbox;
     private Button mBtnContinue;
 
     private void initializeViews() {
+        assert !mInitializeViewsDone;
         setContentView(R.layout.activity_p3a_onboarding);
 
         boolean isFirstInstall = PackageUtils.isFirstInstall(this);
@@ -110,14 +115,15 @@ public void updateDrawState(@NonNull TextPaint ds) {
                 Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         p3aOnboardingText.setMovementMethod(LinkMovementMethod.getInstance());
         p3aOnboardingText.setText(productAnalysisTextSS);
-    }
 
-    @Override
-    public void finishNativeInitialization() {
-        super.finishNativeInitialization();
-        assert !mNativeInitialized;
+        mInitializeViewsDone = true;
+        if (mInvokePostWorkAtInitializeViews) {
+            finishNativeInitializationPostWork();
+        }
+    }
 
-        mNativeInitialized = true;
+    private void finishNativeInitializationPostWork() {
+        assert mInitializeViewsDone;
 
         try {
             mIsP3aEnabled = BravePrefServiceBridge.getInstance().getP3AEnabled();
@@ -137,6 +143,20 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                         }
                     }
                 });
+
+        mBtnContinue.setEnabled(true);
+    }
+
+    @Override
+    public void finishNativeInitialization() {
+        ThreadUtils.assertOnUiThread();
+        super.finishNativeInitialization();
+
+        if (mInitializeViewsDone) {
+            finishNativeInitializationPostWork();
+        } else {
+            mInvokePostWorkAtInitializeViews = true;
+        }
     }
 
     @Override
@@ -165,12 +185,6 @@ private void exitOnboarding() {
     }
 
     private void accept() {
-        if (!mNativeInitialized) {
-            // Disable the "accept" button to indicate that "something is happening".
-            mBtnContinue.setEnabled(false);
-            return;
-        }
-
         // Do not use existing function because it contains consent to Google crash report upload
         SharedPreferencesManager.getInstance().writeBoolean(
                 ChromePreferenceKeys.FIRST_RUN_CACHED_TOS_ACCEPTED, true);

diff --git a/android/java/res/layout/activity_p3a_onboarding.xml b/android/java/res/layout/activity_p3a_onboarding.xml
@@ -80,6 +80,7 @@
 
         <Button
             android:id="@+id/btn_continue"
+            android:enabled="false"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"