[WIP] also check for email

bitfireAT · Jan 28, 2025 · 092d0ee · 092d0ee
1 parent cbb4987
commit 092d0ee
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginInfo.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginInfo.kt
@@ -44,10 +44,14 @@ data class LoginInfo(
          */
         const val EXTRA_LOGIN_FLOW = "loginFlow"
 
+        /**
+         * When set, the account name field will be set to this value.
+         */
         fun shouldSkipLoginTypePage(intent: Intent): Boolean {
             val info = fromIntent(intent)
             val hasUrl = info.baseUri != null
-            return hasUrl
+            val hasEmail = info.credentials?.username?.contains('@') == true
+            return hasUrl || hasEmail
         }
 
         /**
@@ -65,6 +69,9 @@ data class LoginInfo(
             val logger = Logger.getGlobal()
             intent.data?.normalizeScheme()?.let { uri ->
                 try {
+                    if (uri.scheme?.lowercase() == "mailto")
+                        givenUsername = uri.schemeSpecificPart
+
                     // replace caldav[s]:// and carddav[s]:// with http[s]://
                     val realScheme = when (uri.scheme) {
                         "caldav", "carddav" -> "http"