Merge pull request #44 from schibsted/handle-no-customtabs

Fallback to regular browser if Custom Tabs are not supported.
schibsted · Jul 20, 2022 · 91455a4 · 91455a4
2 parents c6530ff + 0a7435c
commit 91455a4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/webflows/src/main/AndroidManifest.xml b/webflows/src/main/AndroidManifest.xml
@@ -11,4 +11,9 @@
         <activity android:name="com.schibsted.account.webflows.activities.RedirectUriReceiverActivity" />
     </application>
 
+    <queries>
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
+    </queries>
 </manifest>
diff --git a/...rc/main/java/com/schibsted/account/webflows/activities/AuthorizationManagementActivity.kt b/...rc/main/java/com/schibsted/account/webflows/activities/AuthorizationManagementActivity.kt
@@ -165,9 +165,9 @@ class AuthorizationManagementActivity : Activity() {
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
         outState.putBoolean(KEY_AUTHORIZATION_STARTED, authStarted)
         outState.putParcelable(KEY_AUTH_INTENT, authIntent)
+        super.onSaveInstanceState(outState)
     }
 
     private fun handleAuthorizationComplete() {

diff --git a/webflows/src/main/java/com/schibsted/account/webflows/client/Client.kt b/webflows/src/main/java/com/schibsted/account/webflows/client/Client.kt
@@ -1,10 +1,10 @@
 package com.schibsted.account.webflows.client
 
-import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import androidx.browser.customtabs.CustomTabsIntent
+import androidx.browser.customtabs.CustomTabsService
 import com.schibsted.account.webflows.activities.AuthorizationManagementActivity
 import com.schibsted.account.webflows.api.HttpError
 import com.schibsted.account.webflows.api.SchibstedAccountApi
@@ -96,10 +96,15 @@ class Client : ClientInterface {
      */
     @JvmOverloads
     override fun getAuthenticationIntent(context: Context, authRequest: AuthRequest): Intent {
-        val customTabsIntent = CustomTabsIntent.Builder().build().apply {
-            intent.data = generateLoginUrl(authRequest)
+        val loginUrl = generateLoginUrl(authRequest)
+        val intent: Intent = if (this.isCustomTabsSupported(context)) {
+            CustomTabsIntent.Builder().build().apply {
+                intent.data = loginUrl
+            }.intent
+        } else {
+            Intent(Intent.ACTION_VIEW, loginUrl).addCategory(Intent.CATEGORY_BROWSABLE)
         }
-        return AuthorizationManagementActivity.createStartIntent(context, customTabsIntent.intent)
+        return AuthorizationManagementActivity.createStartIntent(context, intent)
     }
 
     /**
@@ -110,12 +115,12 @@ class Client : ClientInterface {
     @JvmOverloads
     override fun launchAuth(context: Context, authRequest: AuthRequest) {
         val loginUrl = generateLoginUrl(authRequest)
-        try {
+        if (this.isCustomTabsSupported(context)) {
             CustomTabsIntent.Builder()
                 .build()
                 .launchUrl(context, loginUrl)
-        } catch (e: ActivityNotFoundException) {
-            val intent = Intent(Intent.ACTION_VIEW, loginUrl)
+        } else {
+            val intent = Intent(Intent.ACTION_VIEW, loginUrl).addCategory(Intent.CATEGORY_BROWSABLE)
             context.startActivity(intent)
         }
     }
@@ -126,6 +131,13 @@ class Client : ClientInterface {
         return Uri.parse(loginUrl)
     }
 
+    private fun isCustomTabsSupported(context: Context): Boolean {
+        val serviceIntent = Intent(CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION)
+        val resolveInfos = context.packageManager.queryIntentServices(serviceIntent, 0)
+
+        return !resolveInfos.isEmpty()
+    }
+
     /**
      * Call this with the intent received via deep link to complete the login flow.
      *