Fix social-sign-in in web-ui when default browser does not support custom-tabs (#2721)

* allows fallback to launch the default browser if custom-tabs are not supported

* updates androidx.browser:browser to 1.4.0

* fixes determing the preferred Custom Tabs service and uses the preferred one

* adjusts pre-warming of Custom Tabs to use preferred Custom Tabs Service

Author: AndreasBoehm

aws-android-sdk-cognitoauth/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     api (project(':aws-android-sdk-core')) {
         exclude group: 'com.google.android', module: 'android'
     }
-    implementation 'androidx.browser:browser:1.2.0'
+    implementation 'androidx.browser:browser:1.4.0'
     implementation 'com.amazonaws:aws-android-sdk-cognitoidentityprovider-asf:1.0.0'
 }
 

aws-android-sdk-cognitoauth/src/main/java/com/amazonaws/mobileconnectors/cognitoauth/AuthClient.java

@@ -41,7 +41,6 @@
 import com.amazonaws.mobileconnectors.cognitoauth.exceptions.AuthNavigationException;
 import com.amazonaws.mobileconnectors.cognitoauth.exceptions.AuthServiceException;
 import com.amazonaws.mobileconnectors.cognitoauth.exceptions.BrowserNotInstalledException;
-import com.amazonaws.mobileconnectors.cognitoauth.exceptions.CustomTabsNotSupportedException;
 import com.amazonaws.mobileconnectors.cognitoauth.util.AuthHttpResponseParser;
 import com.amazonaws.mobileconnectors.cognitoauth.handlers.AuthHandler;
 import com.amazonaws.mobileconnectors.cognitoauth.util.ClientConstants;
@@ -52,7 +51,6 @@
 import java.net.URL;
 import java.security.InvalidParameterException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -94,11 +92,6 @@ public class AuthClient {
      */
     private static final long REDIRECT_TIMEOUT_SECONDS = 10;
 
-    /**
-     * Specifies what browser package to default to if one isn't specified.
-     */
-    private static final String DEFAULT_BROWSER_PACKAGE = ClientConstants.CHROME_PACKAGE;
-
     /**
      * Android application context.
      */
@@ -149,6 +142,10 @@ public class AuthClient {
      */
     private boolean isCustomTabSupported;
 
+    /**
+     * Cache the packageName of the custom-tabs-service that should be used.
+     */
+    private String customTabsPackageName;
 
     // - Chrome Custom Tabs Controls
     private CustomTabsClient mCustomTabsClient;
@@ -180,7 +177,9 @@ protected AuthClient(final Context context, final Auth pool, final String userna
         this.isRedirectActivityDeclared = false;
         this.isBrowserInstalled = false;
         this.isCustomTabSupported = false;
-        preWarmChrome();
+        if (isCustomTabSupported()) {
+            preWarmCustomTabs();
+        }
     }
 
     /**
@@ -747,42 +746,39 @@ private boolean isBrowserInstalled() {
     }
 
     /**
-     * Get list of browser packages that support Custom Tabs Service.
+     * Get list of packages that support Custom Tabs Service.
      * @return list of package names that support Custom Tabs.
      */
-    private Collection<String> getSupportedBrowserPackage(){
+    private List<String> getSupportedCustomTabsPackages() {
         PackageManager packageManager = context.getPackageManager();
-        // Get default VIEW intent handler.
-        Intent activityIntent = new Intent()
-                .setAction(Intent.ACTION_VIEW)
-                .addCategory(Intent.CATEGORY_BROWSABLE)
-                .setData(Uri.fromParts("http", "", null));
-
-        // Get all apps that can handle VIEW intents.
-        List<ResolveInfo> resolvedActivityList = packageManager.queryIntentActivities(activityIntent, 0);
+        Intent serviceIntent = new Intent()
+                .setAction(ACTION_CUSTOM_TABS_CONNECTION);
+
+        // Get all services that can handle ACTION_CUSTOM_TABS_CONNECTION intents.
+        List<ResolveInfo> resolvedServicesList = packageManager.queryIntentServices(serviceIntent, 0);
         List<String> packageNamesSupportingCustomTabs = new ArrayList<>();
-        for (ResolveInfo info : resolvedActivityList) {
-            Intent serviceIntent = new Intent()
-                    .setAction(ACTION_CUSTOM_TABS_CONNECTION)
-                    .setPackage(info.activityInfo.packageName);
-            // Check if this package also resolves the Custom Tabs service.
-            if(packageManager.resolveService(serviceIntent, 0) != null) {
-                packageNamesSupportingCustomTabs.add(info.activityInfo.packageName);
-            }
+        for (ResolveInfo info : resolvedServicesList) {
+            packageNamesSupportingCustomTabs.add(info.serviceInfo.packageName);
         }
         return packageNamesSupportingCustomTabs;
     }
 
     /***
-     * Check if there are any browsers on the deivce that support custom tabs.
+     * Check if there are any browsers on the device that support custom tabs.
      * @return true if custom tabs is supported by any browsers on the device else false.
      */
     private boolean isCustomTabSupported() {
         if (isCustomTabSupported) {
             return true;
         }
-        if (getSupportedBrowserPackage().size() > 0) {
+        List<String> supportedCustomTabsPackages = getSupportedCustomTabsPackages();
+        if (supportedCustomTabsPackages.size() > 0) {
             isCustomTabSupported = true;
+            // get the preferred Custom Tabs package
+            customTabsPackageName = CustomTabsClient.getPackageName(
+                    context,
+                    supportedCustomTabsPackages
+            );
             return true;
         }
         return false;
@@ -801,16 +797,15 @@ private void launchCustomTabs(final Uri uri, final Activity activity, final Stri
                 userHandler.onFailure(new BrowserNotInstalledException("No browsers installed."));
                 return;
             }
-            if(!isCustomTabSupported()) {
-                userHandler.onFailure(new CustomTabsNotSupportedException("Browser with custom tabs support not found."));
-                return;
-            }
             CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder(mCustomTabsSession);
             mCustomTabsIntent = builder.build();
-            if(pool.getCustomTabExtras() != null)
+            if(pool.getCustomTabExtras() != null) {
                 mCustomTabsIntent.intent.putExtras(pool.getCustomTabExtras());
+            }
             if(browserPackage != null) {
                 mCustomTabsIntent.intent.setPackage(browserPackage);
+            } else if (customTabsPackageName != null) {
+                mCustomTabsIntent.intent.setPackage(customTabsPackageName);
             }
             mCustomTabsIntent.intent.setData(uri);
             if (activity != null) {
@@ -839,9 +834,12 @@ private String getUserContextData() {
     }
 
     /**
-     * Connects to Chrome Service on the device.
+     * Connects to Custom Tabs Service on the device.
      */
-    private void preWarmChrome() {
+    private void preWarmCustomTabs() {
+        if (customTabsPackageName == null) {
+            return;
+        }
         mCustomTabsServiceConnection = new CustomTabsServiceConnection() {
             @Override
             public void onCustomTabsServiceConnected(final ComponentName name, final CustomTabsClient client) {
@@ -855,6 +853,11 @@ public void onServiceDisconnected(final ComponentName name) {
                 mCustomTabsClient = null;
             }
         };
+        CustomTabsClient.bindCustomTabsService(
+                context,
+                customTabsPackageName,
+                mCustomTabsServiceConnection
+        );
     }
 
     // Inspects context to determine whether HostedUIRedirectActivity is declared in

aws-android-sdk-cognitoauth/src/main/java/com/amazonaws/mobileconnectors/cognitoauth/exceptions/CustomTabsNotSupportedException.java

@@ -47,7 +47,7 @@ dependencies {
     compileOnly project(':aws-android-sdk-auth-google')
     compileOnly project(':aws-android-sdk-auth-userpools')
     compileOnly project(':aws-android-sdk-cognitoauth')
-    compileOnly 'androidx.browser:browser:1.2.0'
+    compileOnly 'androidx.browser:browser:1.4.0'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.2.4'