From 2c262bb29d09f1bf813ff8050805b6683c6ad72b Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Fri, 18 Sep 2020 16:09:43 +0200 Subject: [PATCH 1/2] Fix Base64 #708 --- .../keepass/database/element/database/DatabaseKDBX.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt index 5636009f4..baadf38e9 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt @@ -30,7 +30,6 @@ import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters import com.kunzisoft.keepass.database.action.node.NodeHandler -import com.kunzisoft.keepass.database.element.Attachment import com.kunzisoft.keepass.database.element.DateInstant import com.kunzisoft.keepass.database.element.DeletedObject import com.kunzisoft.keepass.database.element.database.DatabaseKDB.Companion.BACKUP_FOLDER_TITLE @@ -638,7 +637,7 @@ class DatabaseKDBX : DatabaseVersioned { private const val KeyElementName = "Key" private const val KeyDataElementName = "Data" - const val BASE_64_FLAG = Base64.NO_PADDING or Base64.NO_WRAP + const val BASE_64_FLAG = Base64.NO_WRAP const val BUFFER_SIZE_BYTES = 3 * 128 } From ddec91a0c53642cebb6bd073b5d3eba291cb6ba1 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Fri, 18 Sep 2020 16:13:01 +0200 Subject: [PATCH 2/2] Upgrade to 2.8.5 --- CHANGELOG | 3 +++ app/build.gradle | 4 ++-- fastlane/metadata/android/en-US/changelogs/41.txt | 1 + fastlane/metadata/android/fr-FR/changelogs/41.txt | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/41.txt create mode 100644 fastlane/metadata/android/fr-FR/changelogs/41.txt diff --git a/CHANGELOG b/CHANGELOG index da84f6bd0..f436cbfd5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +KeePassDX(2.8.5) + * Fix Base 64 #708 + KeePassDX(2.8.4) * Fix incomplete attachment deletion #684 * Fix opening database v1 without backup folder #692 diff --git a/app/build.gradle b/app/build.gradle index 401f3e6cc..5c9a4e023 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.kunzisoft.keepass" minSdkVersion 14 targetSdkVersion 29 - versionCode = 40 - versionName = "2.8.4" + versionCode = 41 + versionName = "2.8.5" multiDexEnabled true testApplicationId = "com.kunzisoft.keepass.tests" diff --git a/fastlane/metadata/android/en-US/changelogs/41.txt b/fastlane/metadata/android/en-US/changelogs/41.txt new file mode 100644 index 000000000..b673d9ef0 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/41.txt @@ -0,0 +1 @@ + * Fix Base 64 #708 diff --git a/fastlane/metadata/android/fr-FR/changelogs/41.txt b/fastlane/metadata/android/fr-FR/changelogs/41.txt new file mode 100644 index 000000000..2a885e3c6 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/41.txt @@ -0,0 +1 @@ + * Correction Base 64 #708