Merge pull request #7 from Ladsers/beta

24.3.2

Author: Ladsers

app/src/main/java/com/ladsers/passtable/android/activities/TableActivity.kt

@@ -250,7 +250,7 @@ class TableActivity : AppCompatActivity() {
                     biometricAuth.activateAuth(primaryPassword)
                 else loginCompleted()
             }
-            3 -> primaryPasswordDlg.show(PrimaryPasswordDlg.Mode.OPEN, incorrectPassword = true)
+            -2, 3 -> primaryPasswordDlg.show(PrimaryPasswordDlg.Mode.OPEN, incorrectPassword = true)
         }
     }
 

app/src/main/java/com/ladsers/passtable/android/components/BackupManager.kt

@@ -20,7 +20,7 @@ class BackupManager(private val context: Context) {
                     context.deleteFile(it)
                 } ?: let {
                     val backups = context.fileList().filter { it.startsWith(backupMarker) }
-                    if (backups.size >= fileLimit) deleteFirst()
+                    if (backups.size >= fileLimit) deleteFirst(backups)
                 }
 
                 val timestamp = System.currentTimeMillis() / 1000 // accuracy in seconds is enough
@@ -52,10 +52,9 @@ class BackupManager(private val context: Context) {
     private fun find(path: String) = context.fileList()
         .find { s -> s.contains(path) } // contains() is needed not only to discard the timestamp, but also to search for part of the path.
 
-    private fun deleteFirst() {
-        val list = context.fileList()
-        val timestamps = list.map { s -> s.split('_')[0].drop(backupMarker.length).toInt() }
-        val map = timestamps.zip(list).toMap().toSortedMap()
+    private fun deleteFirst(backups: List<String>) {
+        val timestamps = backups.map { s -> s.split('_')[0].drop(backupMarker.length).toInt() }
+        val map = timestamps.zip(backups).toMap().toSortedMap()
 
         context.deleteFile(map[map.firstKey()])
     }

app/src/main/java/com/ladsers/passtable/android/components/BiometricAuth.kt

@@ -92,11 +92,9 @@ class BiometricAuth(
     }
 
     fun checkAvailability(): Boolean {
-        val biometricManager = BiometricManager.from(context)
-        return biometricManager.canAuthenticate(
-            BiometricManager.Authenticators.BIOMETRIC_STRONG or
-                    BiometricManager.Authenticators.DEVICE_CREDENTIAL
-        ) == BiometricManager.BIOMETRIC_SUCCESS
+        val checkResult = BiometricManager.from(context)
+            .canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_STRONG)
+        return checkResult == BiometricManager.BIOMETRIC_SUCCESS
     }
 
     fun resetAuth() {