Merge branch 'develop' of github.com:Kunzisoft/KeePassDX into develop

CHANGELOG

@@ -1,9 +1,13 @@
-KeePassDX(2.9.8)
+KeePassDX(2.9.9)
  *
 
-KeePassDX(2.9.7)
+KeePassDX(2.9.8)
+ * Fix specific attachments with kdbx3.1 databases #828
+ * Fix small bugs
+
+KeePassDX(2.9.7)
+ * Remove write permission since Android 10 #823
  * Fix small bugs
- * Remove write permission since Android 10
 
 KeePassDX(2.9.6)
  * Fix KeyFile bug #820

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 14
         targetSdkVersion 30
-        versionCode = 52
-        versionName = "2.9.8"
+        versionCode = 53
+        versionName = "2.9.9"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
@@ -92,7 +92,7 @@ android {
     }
 }
 
-def room_version = "2.2.5"
+def room_version = "2.2.6"
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt

@@ -554,6 +554,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
                          readOnlyEducationPerformed: Boolean,
                          onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                          onOuterViewClick: ((TapTargetView?) -> Unit)? = null) {
+        try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
                     && !readOnlyEducationPerformed) {
                 val biometricCanAuthenticate = AdvancedUnlockManager.canAuthenticate(requireContext())
@@ -566,6 +567,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
                         onEducationViewClick,
                         onOuterViewClick)
             }
+        } catch (ignored: Exception) {}
     }
 
     enum class Mode {

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.4.21'
     repositories {
         jcenter()
         google()

fastlane/metadata/android/en-US/changelogs/52.txt

@@ -1 +1,2 @@
- *
+ * Fix specific attachments with kdbx3.1 databases #828
+ * Fix small bugs

fastlane/metadata/android/en-US/changelogs/53.txt

@@ -0,0 +1 @@
+ *

fastlane/metadata/android/fr-FR/changelogs/52.txt

@@ -1 +1,2 @@
- *
+ * Correction des pièces jointes spécifiques avec les bases kdbx3.1 #828
+ * Correction de petits bugs

fastlane/metadata/android/fr-FR/changelogs/53.txt

@@ -0,0 +1 @@
+ *