Merge branch '3713-main-sync_issue' into 'main' (695a1ccd) · Commits · e / os / AccountManager

.gitlab-ci.yml

+4 −4

Original line number	Diff line number	Diff line
		@@ -42,8 +42,8 @@ build-prod:
		exit 1
		fi
		cd "release"
		unsigned_build=$(ls *.apk \| grep "unsigned")
		cp $unsigned_build $UNSIGNED_APK
		unsigned_build=$(ls *.apk \| grep "release")
		mv $unsigned_build $UNSIGNED_APK
		artifacts:
		paths:
		- app/build/outputs/apk/ose/
		@@ -61,8 +61,8 @@ build-staging:
		exit 1
		fi
		cd "release"
		unsigned_build=$(ls *.apk \| grep "unsigned")
		cp $unsigned_build $UNSIGNED_APK
		unsigned_build=$(ls *.apk \| grep "release")
		mv $unsigned_build $UNSIGNED_APK
		artifacts:
		paths:
		- app/build/outputs/apk/ose/

app/build.gradle

+1 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,7 @@ android {
		}

		release {
		signingConfig = signingConfigs.debug
		minifyEnabled true
		proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-release.pro'

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)