Skip login type selection when logging in via intent

app/src/androidTest/kotlin/at/bitfire/davdroid/ui/setup/LoginActivityTest.kt

@@ -50,4 +50,14 @@ class LoginActivityTest {
         assertEquals("user", loginInfo.credentials!!.username)
         assertEquals("password", loginInfo.credentials.password)
     }
+
+    @Test
+    fun loginInfoFromIntent_implicit_email() {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("mailto:[email protected]"))
+        val loginInfo = LoginActivity.loginInfoFromIntent(intent)
+        assertEquals(null, loginInfo.baseUri)
+        assertEquals("[email protected]", loginInfo.credentials!!.username)
+        assertEquals(null, loginInfo.credentials.password)
+    }
+
 }

app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginActivity.kt

@@ -23,6 +23,33 @@ import javax.inject.Inject
 @AndroidEntryPoint
 class LoginActivity @Inject constructor(): AppCompatActivity() {
 
+    @Inject lateinit var loginTypesProvider: LoginTypesProvider
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val initialLoginType = loginTypesProvider.intentToInitialLoginType(intent)
+        val skipLoginTypePage = initialLoginType != loginTypesProvider.defaultLoginType
+
+        setContent {
+            LoginScreen(
+                initialLoginType = initialLoginType,
+                skipLoginTypePage = skipLoginTypePage,
+                initialLoginInfo = loginInfoFromIntent(intent),
+                onNavUp = { onSupportNavigateUp() },
+                onFinish = { newAccount ->
+                    finish()
+
+                    if (newAccount != null) {
+                        val intent = Intent(this, AccountActivity::class.java)
+                        intent.putExtra(AccountActivity.EXTRA_ACCOUNT, newAccount)
+                        startActivity(intent)
+                    }
+                }
+            )
+        }
+    }
+
     companion object {
 
         /**
@@ -59,18 +86,23 @@ class LoginActivity @Inject constructor(): AppCompatActivity() {
             var givenUsername: String? = null
             var givenPassword: String? = null
 
-            // extract URI and optionally username/password from Intent data
+            // extract URI or email and optionally username/password from Intent data
             val logger = Logger.getGlobal()
             intent.data?.normalizeScheme()?.let { uri ->
-                try {
+                val realScheme = when (uri.scheme) {
                     // replace caldav[s]:// and carddav[s]:// with http[s]://
-                    val realScheme = when (uri.scheme) {
-                        "caldav", "carddav" -> "http"
-                        "caldavs", "carddavs", "davx5" -> "https"
-                        "http", "https" -> uri.scheme
-                        else -> null
-                    }
-                    if (realScheme != null) {
+                    "caldav", "carddav" -> "http"
+                    "caldavs", "carddavs", "davx5" -> "https"
+
+                    // keep these
+                    "http", "https", "mailto" -> uri.scheme
+
+                    // unknown scheme
+                    else -> null
+                }
+
+                when (realScheme) {
+                    "http", "https" -> {
                         // extract user info
                         uri.userInfo?.split(':')?.let { userInfo ->
                             givenUsername = userInfo.getOrNull(0)
@@ -85,8 +117,9 @@ class LoginActivity @Inject constructor(): AppCompatActivity() {
                             null
                         }
                     }
-                } catch (_: URISyntaxException) {
-                    logger.warning("Got invalid URI from login Intent: $uri")
+
+                    "mailto" ->
+                        givenUsername = uri.schemeSpecificPart
                 }
             }
 
@@ -114,30 +147,4 @@ class LoginActivity @Inject constructor(): AppCompatActivity() {
 
     }
 
-    @Inject lateinit var loginTypesProvider: LoginTypesProvider
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val (initialLoginType, skipLoginTypePage) = loginTypesProvider.intentToInitialLoginType(intent)
-
-        setContent {
-            LoginScreen(
-                initialLoginType = initialLoginType,
-                skipLoginTypePage = skipLoginTypePage,
-                initialLoginInfo = loginInfoFromIntent(intent),
-                onNavUp = { onSupportNavigateUp() },
-                onFinish = { newAccount ->
-                    finish()
-
-                    if (newAccount != null) {
-                        val intent = Intent(this, AccountActivity::class.java)
-                        intent.putExtra(AccountActivity.EXTRA_ACCOUNT, newAccount)
-                        startActivity(intent)
-                    }
-                }
-            )
-        }
-    }
-
 }

app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginTypesProvider.kt

@@ -13,10 +13,9 @@ interface LoginTypesProvider {
     val defaultLoginType: LoginType
 
     /**
-     * Which login type to use and whether to skip the login type selection page. Used for Nextcloud
-     * login flow. May be used by other login flows.
+     * Which login type to use. Used for Nextcloud login flow and may be used for other intent started flows.
      */
-    fun intentToInitialLoginType(intent: Intent): Pair<LoginType, Boolean> = Pair(defaultLoginType, false)
+    fun intentToInitialLoginType(intent: Intent): LoginType = defaultLoginType
 
     /** Whether the [LoginTypePage] may be non-interactive. This causes it to be skipped in back navigation. */
     val maybeNonInteractive: Boolean

app/src/ose/kotlin/at/bitfire/davdroid/ui/setup/StandardLoginTypesProvider.kt

@@ -26,11 +26,19 @@ class StandardLoginTypesProvider @Inject constructor() : LoginTypesProvider {
 
     override val defaultLoginType = UrlLogin
 
-    override fun intentToInitialLoginType(intent: Intent) =
-        if (intent.hasExtra(LoginActivity.EXTRA_LOGIN_FLOW))
-            Pair(NextcloudLogin, true)
-        else
-            Pair(defaultLoginType, false)
+    override fun intentToInitialLoginType(intent: Intent): LoginType =
+        intent.data?.normalizeScheme().let { uri ->
+            when {
+                intent.hasExtra(LoginActivity.EXTRA_LOGIN_FLOW) ->
+                    NextcloudLogin
+                uri?.scheme == "mailto" ->
+                    EmailLogin
+                listOf("caldavs", "carddavs", "davx5", "http", "https").any { uri?.scheme == it } ->
+                    UrlLogin
+                else ->
+                    defaultLoginType
+            }
+        }
 
     @Composable
     override fun LoginTypePage(