From ba24ad5ef2ea0abaa56e1d81cc05ce16c267f857 Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 12 Mar 2025 14:44:18 +0530 Subject: [PATCH 1/2] Sign release with test key --- .gitlab-ci.yml | 8 ++++---- app/build.gradle | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7aac89442..9a3ce1ae3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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/ diff --git a/app/build.gradle b/app/build.gradle index b5d48cd24..7650c25ba 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -118,6 +118,7 @@ android { } release { + signingConfig = signingConfigs.debug minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-release.pro' -- GitLab From 5574739ac2736891582c7b28a3a0170779c6b4f2 Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 30 Sep 2025 15:02:12 +0530 Subject: [PATCH 2/2] Fix sync issues after a fresh login --- .../davdroid/ui/setup/AccountDetailsFragment.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt index bf7029483..d3a087890 100644 --- a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt +++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt @@ -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) -- GitLab