Merge pull request #297 from andreban/splash-freeze-fix

Fixes asynch launchTwa freezing splash screens
GoogleChrome · Jun 7, 2021 · 52f8353 · 52f8353
2 parents 73b0965 + ec21f95
commit 52f8353
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/...browserhelper/src/main/java/com/google/androidbrowserhelper/trusted/LauncherActivity.java b/...browserhelper/src/main/java/com/google/androidbrowserhelper/trusted/LauncherActivity.java
@@ -155,6 +155,18 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             return;
         }
 
+        mMetadata = LauncherActivityMetadata.parse(this);
+
+        if (splashScreenNeeded()) {
+            mSplashScreenStrategy = new PwaWrapperSplashScreenStrategy(this,
+                    mMetadata.splashImageDrawableId,
+                    getColorCompat(mMetadata.splashScreenBackgroundColorId),
+                    getSplashImageScaleType(),
+                    getSplashImageTransformationMatrix(),
+                    mMetadata.splashScreenFadeOutDurationMillis,
+                    mMetadata.fileProviderAuthority);
+        }
+
         if (shouldLaunchImmediately()) {
             launchTwa();
         }
@@ -175,16 +187,12 @@ protected boolean shouldLaunchImmediately() {
      * {@link #shouldLaunchImmediately()} returns {@code false}.
      */
     protected void launchTwa() {
-        mMetadata = LauncherActivityMetadata.parse(this);
-
-        if (splashScreenNeeded()) {
-            mSplashScreenStrategy = new PwaWrapperSplashScreenStrategy(this,
-                    mMetadata.splashImageDrawableId,
-                    getColorCompat(mMetadata.splashScreenBackgroundColorId),
-                    getSplashImageScaleType(),
-                    getSplashImageTransformationMatrix(),
-                    mMetadata.splashScreenFadeOutDurationMillis,
-                    mMetadata.fileProviderAuthority);
+        // When launching asynchronously, developers should check if the Activity is finishing
+        // before calling launchTwa(). We double check the condition here and prevent the launch
+        // if that's the case.
+        if (isFinishing()) {
+            Log.d(TAG, "Aborting launchTwa() as Activity is finishing");
+            return;
         }
 
         CustomTabColorSchemeParams darkModeColorScheme = new CustomTabColorSchemeParams.Builder()

diff --git a/.../androidbrowserhelper/demos/twa_firebase_analytics/FirebaseAnalyticsLauncherActivity.java b/.../androidbrowserhelper/demos/twa_firebase_analytics/FirebaseAnalyticsLauncherActivity.java
@@ -36,6 +36,11 @@ public class FirebaseAnalyticsLauncherActivity extends LauncherActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        // `super.onCreate()` may have called `finish()`. In this case, we don't do any work.
+        if (isFinishing()) {
+            return;
+        }
+
         FirebaseAnalytics firebaseAnalytics = FirebaseAnalytics.getInstance(this);
 
         // Start the asynchronous task to get the Firebase application instance id.

diff --git a/.../google/androidbrowserhelper/demos/twa_offline_first/OfflineFirstTWALauncherActivity.java b/.../google/androidbrowserhelper/demos/twa_offline_first/OfflineFirstTWALauncherActivity.java
@@ -30,6 +30,11 @@ public class OfflineFirstTWALauncherActivity extends LauncherActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        // `super.onCreate()` may have called `finish()`. In this case, we don't do any work.
+        if (isFinishing()) {
+            return;
+        }
         tryLaunchTwa();
     }