From b6b30feb45bd1dd15cc21e981dcd026824f971b3 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 22 Nov 2024 21:38:03 +0530 Subject: [PATCH 1/3] feat: use platform keys to sign --- app/build.gradle | 7 +++++++ app/keystore/platform.jks | Bin 0 -> 3052 bytes 2 files changed, 7 insertions(+) create mode 100644 app/keystore/platform.jks diff --git a/app/build.gradle b/app/build.gradle index abf79879..f0a99c85 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,10 +84,17 @@ android { keyAlias System.getenv("ANDROID_KEY_ALIAS") keyPassword System.getenv("ANDROID_KEY_PASSWORD") } + debug { + storeFile file("keystore/platform.jks") + storePassword "platform" + keyAlias "platform" + keyPassword "platform" + } } buildTypes { debug { + signingConfig = signingConfigs.debug buildConfigField "String", "EMAIL_KEY", "\"invalid\"" } diff --git a/app/keystore/platform.jks b/app/keystore/platform.jks new file mode 100644 index 0000000000000000000000000000000000000000..b778840542e79c048bcf570aa960243eeb9b9d53 GIT binary patch literal 3052 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 X4gBin;_WFr#VkVgR?9E{583|$1Z;)? literal 0 HcmV?d00001 -- GitLab From f982344df368a7fc9628a2749a1f66c76ca5c740 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 3 Jan 2025 11:53:49 +0530 Subject: [PATCH 2/3] fix: Improve email handling in AccountSettings --- .../kotlin/at/bitfire/davdroid/settings/AccountSettings.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/at/bitfire/davdroid/settings/AccountSettings.kt b/app/src/main/kotlin/at/bitfire/davdroid/settings/AccountSettings.kt index a3fb1d3a..abbb5855 100644 --- a/app/src/main/kotlin/at/bitfire/davdroid/settings/AccountSettings.kt +++ b/app/src/main/kotlin/at/bitfire/davdroid/settings/AccountSettings.kt @@ -201,18 +201,17 @@ class AccountSettings( } private fun addEmailToBundle(bundle: Bundle, email: String?, userName: String?) { - if (email != null) { + if (!email.isNullOrEmpty() && email != "null") { bundle.putString(KEY_EMAIL_ADDRESS, email) return } userName?.let { - if (it.contains("@")) { + if (it != "null" && it.contains("@")) { bundle.putString(KEY_EMAIL_ADDRESS, it) } } } - } -- GitLab From 91565658f0faffddde3bf51efdf19779502d4fab Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 8 Jan 2025 11:55:22 +0530 Subject: [PATCH 3/3] accountManager: Change version to 4.3.9-6 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f0a99c85..6b77a66e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { defaultConfig { applicationId "foundation.e.accountmanager" - versionCode 403090005 - versionName '4.3.10' + versionCode 403090006 + versionName '4.3.9-6' buildConfigField "long", "buildTime", System.currentTimeMillis() + "L" -- GitLab