Merge pull request #32 from GoogleChrome/NullSession

Launch CCT when Session creation fails.
GoogleChrome · Oct 7, 2019 · 9f0a0f0 · 9f0a0f0
2 parents 8460510 + 451e37e
commit 9f0a0f0
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 10 deletions.
diff --git a/...rhelper/src/androidTest/java/com/google/androidbrowserhelper/trusted/TwaLauncherTest.java b/...rhelper/src/androidTest/java/com/google/androidbrowserhelper/trusted/TwaLauncherTest.java
@@ -84,6 +84,9 @@ public class TwaLauncherTest {
     @Before
     public void setUp() {
         TwaProviderPicker.restrictToPackageForTesting(mContext.getPackageName());
+
+        // TODO(peconn): Maybe make this a test rule?
+        TestCustomTabsService.setCanCreateSessions(true);
         mActivity = mActivityTestRule.getActivity();
         mTwaLauncher = new TwaLauncher(mActivity);
     }
@@ -129,6 +132,16 @@ public void fallsBackToCustomTab() {
         assertFalse(intent.hasExtra(EXTRA_LAUNCH_AS_TRUSTED_WEB_ACTIVITY));
     }
 
+    @Test
+    public void fallsBackToCustomTab_whenSessionCreationFails() {
+        TestCustomTabsService.setCanCreateSessions(false);
+
+        Runnable launchRunnable = () -> mTwaLauncher.launch(URL);
+        TestBrowser browser = getBrowserActivityWhenLaunched(launchRunnable);
+        assertFalse(browser.getIntent().getBooleanExtra(EXTRA_LAUNCH_AS_TRUSTED_WEB_ACTIVITY,
+                false));
+    }
+
     @Test
     public void customTabFallbackUsesStatusBarColor() {
         mEnableComponents.manuallyDisable(TestCustomTabsServiceSupportsTwas.class);

diff --git a/...st/java/com/google/androidbrowserhelper/trusted/testcomponents/TestCustomTabsService.java b/...st/java/com/google/androidbrowserhelper/trusted/testcomponents/TestCustomTabsService.java
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -41,6 +42,9 @@ public class TestCustomTabsService extends CustomTabsService {
     public static final String CALLBACK_BIND_TO_POST_MESSAGE = "BindToPostMessageService";
     private static TestCustomTabsService sInstance;
 
+    // The TestCustomTabsService isn't necessarily created when we want to set this.
+    private static final AtomicBoolean sCanCreateSessions = new AtomicBoolean(true);
+
     private final CountDownLatch mFileReceivingLatch = new CountDownLatch(1);
 
     private boolean mPostMessageRequested;
@@ -64,8 +68,12 @@ protected boolean warmup(long flags) {
 
     @Override
     protected boolean newSession(CustomTabsSessionToken sessionToken) {
-        mSession = sessionToken;
-        return true;
+        if (sCanCreateSessions.get()) {
+            mSession = sessionToken;
+            return true;
+        } else {
+            return false;
+        }
     }
 
     @Override
@@ -140,4 +148,8 @@ public boolean waitForSplashImageFile(int timeoutMillis) {
             return false;
         }
     }
+
+    public static void setCanCreateSessions(boolean canCreateSessions) {
+        sCanCreateSessions.set(canCreateSessions);
+    }
 }
diff --git a/androidbrowserhelper/src/main/java/com/google/androidbrowserhelper/trusted/TwaLauncher.java b/androidbrowserhelper/src/main/java/com/google/androidbrowserhelper/trusted/TwaLauncher.java
@@ -57,9 +57,6 @@ public class TwaLauncher {
     @Nullable
     private CustomTabsSession mSession;
 
-    @Nullable
-    private Runnable mOnSessionCreatedRunnable;
-
     private boolean mDestroyed;
 
     /**
@@ -154,17 +151,28 @@ private void launchTwa(TrustedWebActivityIntentBuilder twaBuilder,
 
         Runnable onSessionCreatedRunnable = () ->
                 launchWhenSessionEstablished(twaBuilder, splashScreenStrategy, completionCallback);
+
         if (mSession != null) {
             onSessionCreatedRunnable.run();
             return;
         }
 
-        mOnSessionCreatedRunnable = onSessionCreatedRunnable;
+        Runnable onSessionCreationFailedRunnable = () -> {
+            // The provider has been unable to create a session for us, we can't launch a
+            // Trusted Web Activity. We could either exit, forcing the user to try again,
+            // hopefully successfully this time or we could launch a Custom Tab giving the user
+            // a subpar experience (compared to a TWA).
+            // We'll open in a CCT, but pay attention to what users want.
+            launchCct(twaBuilder, completionCallback);
+        };
+
         if (mServiceConnection == null) {
             mServiceConnection = new TwaCustomTabsServiceConnection();
         }
-        CustomTabsClient.bindCustomTabsService(mContext, mProviderPackage,
-                mServiceConnection);
+
+        mServiceConnection.setSessionCreationRunnables(
+                onSessionCreatedRunnable, onSessionCreationFailedRunnable);
+        CustomTabsClient.bindCustomTabsService(mContext, mProviderPackage, mServiceConnection);
     }
 
     private void launchWhenSessionEstablished(TrustedWebActivityIntentBuilder twaBuilder,
@@ -214,6 +222,15 @@ public String getProviderPackage() {
     }
 
     private class TwaCustomTabsServiceConnection extends CustomTabsServiceConnection {
+        private Runnable mOnSessionCreatedRunnable;
+        private Runnable mOnSessionCreationFailedRunnable;
+
+        private void setSessionCreationRunnables(@Nullable Runnable onSuccess,
+                @Nullable Runnable onFailure) {
+            mOnSessionCreatedRunnable = onSuccess;
+            mOnSessionCreationFailedRunnable = onFailure;
+        }
+
         @Override
         public void onCustomTabsServiceConnected(ComponentName componentName,
                 CustomTabsClient client) {
@@ -222,10 +239,15 @@ public void onCustomTabsServiceConnected(ComponentName componentName,
                 client.warmup(0);
             }
             mSession = client.newSession(null, mSessionId);
-            if (mOnSessionCreatedRunnable != null) {
+
+            if (mSession != null && mOnSessionCreatedRunnable != null) {
                 mOnSessionCreatedRunnable.run();
-                mOnSessionCreatedRunnable = null;
+            } else if (mSession == null && mOnSessionCreationFailedRunnable != null) {
+                mOnSessionCreationFailedRunnable.run();
             }
+
+            mOnSessionCreatedRunnable = null;
+            mOnSessionCreationFailedRunnable = null;
         }
 
         @Override