From aafcb2e94a79e9c9d671de829edc3435d20d9cf8 Mon Sep 17 00:00:00 2001 From: Sunik Kupfer Date: Thu, 2 May 2024 12:32:23 +0200 Subject: [PATCH] Pre-select per-contact categories for login type NextcloudLogin (#774) * Pre-select per-contact categories for login type NextcloudLogin * Update the group method unconditionally to suggested group method --- .../kotlin/at/bitfire/davdroid/network/NextcloudLoginFlow.kt | 4 +++- .../kotlin/at/bitfire/davdroid/ui/setup/LoginScreenModel.kt | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/at/bitfire/davdroid/network/NextcloudLoginFlow.kt b/app/src/main/kotlin/at/bitfire/davdroid/network/NextcloudLoginFlow.kt index 1457c9ee9..87498e9ef 100644 --- a/app/src/main/kotlin/at/bitfire/davdroid/network/NextcloudLoginFlow.kt +++ b/app/src/main/kotlin/at/bitfire/davdroid/network/NextcloudLoginFlow.kt @@ -9,6 +9,7 @@ import at.bitfire.dav4jvm.exception.DavException import at.bitfire.dav4jvm.exception.HttpException import at.bitfire.davdroid.db.Credentials import at.bitfire.davdroid.ui.setup.LoginInfo +import at.bitfire.vcard4android.GroupMethod import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runInterruptible import kotlinx.coroutines.withContext @@ -107,7 +108,8 @@ class NextcloudLoginFlow( credentials = Credentials( username = json.getString("loginName"), password = json.getString("appPassword") - ) + ), + suggestedGroupMethod = GroupMethod.CATEGORIES ) } 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 index af1a7e22d..36bfe0f8d 100644 --- a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreenModel.kt +++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreenModel.kt @@ -80,6 +80,7 @@ class LoginScreenModel @Inject constructor( ?: loginInfo.baseUri?.host ?: "" updateAccountNameAndEmails(initialAccountName, emails) + updateGroupMethod(loginInfo.suggestedGroupMethod) page = Page.AccountDetails }