MMA-3883 Applied as much as I could understand of the suggested fix.

mimacom · Dec 18, 2023 · c2712d3 · c2712d3
1 parent 00eb5c6
commit c2712d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/android/src/main/java/com/oblador/keychain/cipherStorage/CipherStorageKeystoreRsaEcb.java b/android/src/main/java/com/oblador/keychain/cipherStorage/CipherStorageKeystoreRsaEcb.java
@@ -238,7 +238,7 @@ protected KeyGenParameterSpec.Builder getKeyGenSpecBuilder(@NonNull final String
       .setEncryptionPaddings(PADDING_PKCS1)
       .setRandomizedEncryptionRequired(true)
       .setUserAuthenticationRequired(true)
-      .setUserAuthenticationValidityDurationSeconds(5)
+      .setUserAuthenticationValidityDurationSeconds(-1)
       .setKeySize(keySize);
   }
 

diff --git a/...a/com/oblador/keychain/decryptionHandler/DecryptionResultHandlerInteractiveBiometric.java b/...a/com/oblador/keychain/decryptionHandler/DecryptionResultHandlerInteractiveBiometric.java
@@ -125,8 +125,13 @@ protected FragmentActivity getCurrentActivity() {
 
   protected BiometricPrompt authenticateWithPrompt(@NonNull final FragmentActivity activity) {
     final BiometricPrompt prompt = new BiometricPrompt(activity, executor, this);
-    prompt.authenticate(this.promptInfo);
-
+    try {
+      this.storage.getCachedInstance().init(Cipher.DECRYPT_MODE, context.key);
+      prompt.authenticate(this.promptInfo, new BiometricPrompt.CryptoObject(this.storage.getCachedInstance()));
+    }
+    catch (final Throwable fail) {
+      this.onDecrypt(null, fail);
+    }
     return prompt;
   }