mirror of
https://github.com/bitfireAT/davx5-ose
synced 2024-09-06 18:01:11 +00:00
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
This commit is contained in:
parent
e40fa6e0fb
commit
aafcb2e94a
|
@ -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
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -80,6 +80,7 @@ class LoginScreenModel @Inject constructor(
|
|||
?: loginInfo.baseUri?.host
|
||||
?: ""
|
||||
updateAccountNameAndEmails(initialAccountName, emails)
|
||||
updateGroupMethod(loginInfo.suggestedGroupMethod)
|
||||
page = Page.AccountDetails
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue