Merge branch 'release/2.5.0.0beta20'

Add changelog
Fix Entry information is not correct #286
2025-12-04 15:49:33 +01:00 · 2019-08-16 20:34:13 +02:00 · 2019-08-16 19:17:59 +02:00 · 2019-08-16 19:08:59 +02:00 · 2019-08-16 18:41:24 +02:00 · 2019-08-14 19:26:04 +02:00
5 changed files with 29 additions and 4 deletions
--- a/3
+++ b/3
@@ -1,3 +1,6 @@
+KeepassDX (2.5.0.0beta20)
+ * Fix a major bug that displays an entry history
+
 KeepassDX (2.5.0.0beta19)
 * Add lock button always visible
 * New connection workflow
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
        applicationId "com.kunzisoft.keepass"
        minSdkVersion 14
        targetSdkVersion 27
-        versionCode = 19
-        versionName = "2.5.0.0beta19"
+        versionCode = 20
+        versionName = "2.5.0.0beta20"
        multiDexEnabled true

        testApplicationId = "com.kunzisoft.keepass.tests"
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabase.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabase.kt
@@ -233,7 +233,9 @@ abstract class PwDatabase<Group : PwGroup<*, Group, Entry>, Entry : PwEntry<Grou
    }

    fun addGroupIndex(group: Group) {
-        this.groupIndexes[group.nodeId] = group
+        val groupId = group.nodeId
+        if (!groupIndexes.containsKey(groupId))
+            this.groupIndexes[groupId] = group
    }

    fun removeGroupIndex(group: Group) {
@@ -263,7 +265,9 @@ abstract class PwDatabase<Group : PwGroup<*, Group, Entry>, Entry : PwEntry<Grou
    }

    fun addEntryIndex(entry: Entry) {
-        this.entryIndexes[entry.nodeId] = entry
+        val entryId = entry.nodeId
+        if (!entryIndexes.containsKey(entryId))
+            this.entryIndexes[entryId] = entry
    }

    fun removeEntryIndex(entry: Entry) {
--- a/fastlane/metadata/android/en-US/changelogs/20.txt
+++ b/fastlane/metadata/android/en-US/changelogs/20.txt
@@ -0,0 +1,9 @@
+ * Add lock button always visible
+ * New connection workflow
+ * Code refactored in Kotlin
+ * Better notification implementation
+ * Better views for large screen
+ * Magikeyboard enhancement
+ * Fix Recycle Bin
+ * Fix memory when load database
+ * Fix a bug that displays an entry history in 2.5.0.0beta19
--- a/fastlane/metadata/android/fr-FR/changelogs/20.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/20.txt
@@ -0,0 +1,9 @@
+ * Ajout du bouton de lock toujours visible
+ * Nouveau workflow de connexion
+ * Code refactorisé en Kotlin
+ * Meilleure implementation des notifications
+ * Meilleures vues pour les écrans larges
+ * Amélioration du Magikeyboard
+ * Correction de la Corbeille
+ * Correction de la mémoire lors du chargement de base de données
+ * Correction d'un bug qui affiche un historique d'entrée (2.5.0.0beta19)
Author	SHA1	Message	Date
J-Jamet	da4f41732a	Merge branch 'release/2.5.0.0beta20'	2019-08-16 20:34:13 +02:00
J-Jamet	0414adf5de	Add changelog	2019-08-16 19:17:59 +02:00
J-Jamet	d9b2942f66	Fix Entry information is not correct #286	2019-08-16 19:08:59 +02:00
J-Jamet	cbe7907b07	Upgrade version to 2.5.0.0beta20	2019-08-16 18:41:24 +02:00
J-Jamet	3989ca3ad1	Merge tag '2.5.0.0beta19' into develop 2.5.0.0beta19	2019-08-14 19:26:04 +02:00