[tor-commits] [tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens

[gk at torproject.org]

commit 8b16afa5b647078a22a862360f4764bce82760ca
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Fri Mar 22 13:43:30 2019 +0000

    fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
    
    Bug 29858 - Load onboarding panels after bootstrapping is completed.
---
 mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index f8af42f09b5f..dce3dc1548c2 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -1363,10 +1363,10 @@ public class BrowserApp extends GeckoApp
         if (!IntentUtils.getIsInAutomationFromEnvironment(intent)) {
             if (mTorNeedsStart) {
                 showTorBootstrapPager();
+            } else {
+                // We can't show the first run experience until Gecko has finished initialization (bug 1077583).
+                checkFirstrun(this, intent);
             }
-
-            // We can't show the first run experience until Gecko has finished initialization (bug 1077583).
-            checkFirstrun(this, intent);
         }
     }
 
@@ -3138,6 +3138,11 @@ public class BrowserApp extends GeckoApp
 
                     // If we finished, then Tor bootstrapped 100%
                     mTorNeedsStart = false;
+
+                    // When bootstrapping completes, check if the Firstrun (onboarding) screens
+                    // should be shown.
+                    final SafeIntent intent = new SafeIntent(getIntent());
+                    checkFirstrun(BrowserApp.this, intent);
                 }
             });
         }