Use external app for OIDC fallback instead of webview

element-hq · Feb 21, 2025 · e18a04e · e18a04e
1 parent 2518191
commit e18a04e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
@@ -139,8 +139,9 @@ class LoginFlowNode @AssistedInject constructor(
                                 oidcEntryPoint.openUrlInCustomTab(it, darkTheme, oidcDetails.url)
                             }
                         } else {
-                            // Fallback to WebView mode
-                            backstack.push(NavTarget.OidcView(oidcDetails))
+                            activity?.let {
+                                oidcEntryPoint.openUrlInExternalApp(it, oidcDetails.url)
+                            }
                         }
                     }
 

diff --git a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcEntryPoint.kt b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcEntryPoint.kt
@@ -14,5 +14,6 @@ import com.bumble.appyx.core.node.Node
 interface OidcEntryPoint {
     fun canUseCustomTab(): Boolean
     fun openUrlInCustomTab(activity: Activity, darkTheme: Boolean, url: String)
+    fun openUrlInExternalApp(activity: Activity, url: String)
     fun createFallbackWebViewNode(parentNode: Node, buildContext: BuildContext, url: String): Node
 }
diff --git a/...oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcEntryPoint.kt b/...oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcEntryPoint.kt
@@ -12,6 +12,7 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
+import io.element.android.libraries.androidutils.system.openUrlInExternalApp
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.auth.OidcDetails
@@ -32,6 +33,10 @@ class DefaultOidcEntryPoint @Inject constructor(
         activity.openUrlInChromeCustomTab(null, darkTheme, url)
     }
 
+    override fun openUrlInExternalApp(activity: Activity, url: String) {
+        activity.openUrlInExternalApp(url)
+    }
+
     override fun createFallbackWebViewNode(parentNode: Node, buildContext: BuildContext, url: String): Node {
         assert(!canUseCustomTab()) { "Custom tab should be used instead of the fallback node." }
         val inputs = OidcNode.Inputs(OidcDetails(url))