Fix sync issues after a fresh login (5574739a) · Commits · e / os / AccountManager

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -374,6 +374,10 @@ class AccountDetailsFragment : Fragment() {
		accountType in AccountUtils.getOpenIdMainAccountTypes(context) &&
		credentials?.authState != null

		val isExisitingAccount = accountManager.getAccountsByType(account.type)
		.any { it.name == credentials?.userName }
		val isReauthAccount = basicAuthAccount != null \|\| (isAccountUsingOAuth && isExisitingAccount)

		if (basicAuthAccount != null) {
		val authState = credentials?.authState
		if (authState != null) {
		@@ -446,7 +450,7 @@ class AccountDetailsFragment : Fragment() {
		var calendarSyncEnabled = true
		var tasksSyncEnabled = true

		if (basicAuthAccount != null \|\| isAccountUsingOAuth) {
		if (isReauthAccount) {
		val accountToUpdate = basicAuthAccount ?: account
		val oldSettings = AccountSettings(context, accountToUpdate)
		val addressBookAuthority = context.getString(R.string.address_books_authority)
		@@ -554,7 +558,7 @@ class AccountDetailsFragment : Fragment() {
		// Configure CardDAV service
		val addressBookAuthority = context.getString(R.string.address_books_authority)
		if (config.cardDAV != null) {
		if (basicAuthAccount != null \|\| isAccountUsingOAuth) {
		if (isReauthAccount) {
		val accountToUpdate = basicAuthAccount ?: account
		// Update existing service
		val service = db.serviceDao().getByAccountAndType(accountToUpdate.name, Service.TYPE_CARDDAV)
		@@ -593,7 +597,7 @@ class AccountDetailsFragment : Fragment() {

		// Configure CalDAV service
		if (config.calDAV != null) {
		if (basicAuthAccount != null \|\| isAccountUsingOAuth) {
		if (isReauthAccount) {
		val accountToUpdate = basicAuthAccount ?: account
		// Update existing service
		val service = db.serviceDao().getByAccountAndType(accountToUpdate.name, Service.TYPE_CALDAV)