Start at LoginDetails page if logging in via intent (#772)

* Start at LoginDetails page if login via intent has data * Ignore intent on re-creation
bitfireAT · May 2, 2024 · 9c6c95a · 9c6c95a
1 parent aafcb2e
commit 9c6c95a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginActivity.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginActivity.kt
@@ -109,7 +109,13 @@ class LoginActivity @Inject constructor(): AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         // start with login info from Intent
-        model.updateLoginInfo(loginInfoFromIntent(intent))
+        if (savedInstanceState == null) {
+            val loginInfo = loginInfoFromIntent(intent)
+            if (loginInfo.baseUri != null) {
+                model.updateLoginInfo(loginInfo)
+                model.navToPage(LoginScreenModel.Page.LoginDetails)
+            }
+        }
 
         setContent {
             LoginScreen(

diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreenModel.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreenModel.kt
@@ -53,6 +53,10 @@ class LoginScreenModel @Inject constructor(
 
     // navigation events
 
+    fun navToPage(toPage: Page) {
+        page = toPage
+    }
+
     fun navToNextPage() {
         when (page) {
             Page.LoginType -> {