Merge branch 'release/2.5.0.0beta20'

CHANGELOG

@@ -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

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode = 19
+        versionCode = 20
-        versionName = "2.5.0.0beta19"
+        versionName = "2.5.0.0beta20"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"

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) {

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

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)