Update WebAuthenticator.android.cs

xamarin · May 2, 2022 · f427156 · f427156
1 parent bc74dce
commit f427156
Showing 1 changed file with 23 additions and 10 deletions.
diff --git a/Xamarin.Essentials/WebAuthenticator/WebAuthenticator.android.cs b/Xamarin.Essentials/WebAuthenticator/WebAuthenticator.android.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Android.Content;
 #if __ANDROID_29__
@@ -71,6 +71,21 @@ static async Task<WebAuthenticatorResult> PlatformAuthenticateAsync(WebAuthentic
             tcsResponse = new TaskCompletionSource<WebAuthenticatorResult>();
             currentRedirectUri = callbackUrl;
 
+            if (!(await StartCustomTabsActivity(url)))
+            {
+                // Fall back to opening the system-registered browser if necessary
+                var urlOriginalString = url.OriginalString;
+                var browserIntent = new Intent(Intent.ActionView, global::Android.Net.Uri.Parse(urlOriginalString));
+                Platform.CurrentActivity.StartActivity(browserIntent);
+            }
+
+            return await tcsResponse.Task;
+        }
+
+        static async Task<bool> StartCustomTabsActivity(Uri url)
+        {
+            // Is only set to true if BindServiceAsync succeeds and no exceptions are thrown
+            var success = false;
             var parentActivity = Platform.GetCurrentActivity(true);
 
             var customTabsActivityManager = CustomTabsActivityManager.From(parentActivity);
@@ -84,16 +99,12 @@ static async Task<WebAuthenticatorResult> PlatformAuthenticateAsync(WebAuthentic
 
                     customTabsIntent.Intent.SetData(global::Android.Net.Uri.Parse(url.OriginalString));
 
-                    WebAuthenticatorIntermediateActivity.StartActivity(parentActivity, customTabsIntent.Intent);
-                }
-                else
-                {
-                    // Fall back to opening the system browser if necessary
-                    var browserIntent = new Intent(Intent.ActionView, global::Android.Net.Uri.Parse(url.OriginalString));
-                    Platform.CurrentActivity.StartActivity(browserIntent);
+                    if (customTabsIntent.Intent.ResolveActivity(parentActivity.PackageManager) != null)
+                    {
+                        WebAuthenticatorIntermediateActivity.StartActivity(parentActivity, customTabsIntent.Intent);
+                        success = true;
+                    }
                 }
-
-                return await tcsResponse.Task;
             }
             finally
             {
@@ -105,6 +116,8 @@ static async Task<WebAuthenticatorResult> PlatformAuthenticateAsync(WebAuthentic
                 {
                 }
             }
+
+            return success;
         }
 
         static Task<bool> BindServiceAsync(CustomTabsActivityManager manager)