Merge pull request #12076 from brave/20444-clear-fingerprint-after-reset

fix(wallet): clear fingerprint after wallet reset
brave · Jan 31, 2022 · d49880d · d49880d
2 parents b91657a + ac9bb69
commit d49880d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/KeystoreHelper.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/KeystoreHelper.java
@@ -116,4 +116,11 @@ public static String decryptText()
 
         return new String(cipher.doFinal(Base64.decode(encryptedBase64, Base64.DEFAULT)), "UTF-8");
     }
+
+    public static void resetBiometric() {
+        SharedPreferencesManager manager = SharedPreferencesManager.getInstance();
+        manager.removeKey(BravePreferenceKeys.BRAVE_USE_BIOMETRICS_FOR_WALLET);
+        manager.removeKey(BravePreferenceKeys.BRAVE_BIOMETRICS_FOR_WALLET_ENCRYPTED);
+        manager.removeKey(BravePreferenceKeys.BRAVE_BIOMETRICS_FOR_WALLET_IV);
+    }
 }
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveWalletResetPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveWalletResetPreference.java
@@ -28,6 +28,7 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.app.BraveActivity;
+import org.chromium.chrome.browser.crypto_wallet.util.KeystoreHelper;
 import org.chromium.chrome.browser.crypto_wallet.util.Utils;
 import org.chromium.chrome.browser.crypto_wallet.util.WalletNativeUtils;
 import org.chromium.ui.KeyboardVisibilityDelegate;
@@ -87,6 +88,7 @@ public void onClick(DialogInterface dialog, int button) {
                     if (TextUtils.equals(inputText, mConfirmationPhrase)) {
                         Log.w(TAG, "Reset");
                         WalletNativeUtils.resetWallet();
+                        KeystoreHelper.resetBiometric();
                         Utils.setCryptoOnboarding(true);
                     }