ç¾çº¦ä»£æ£åå¯æ¯ä»åè®®

- + diff --git a/platforms/android/app/src/main/java/de/niklasmerz/cordova/biometric/BiometricActivity.java b/platforms/android/app/src/main/java/de/niklasmerz/cordova/biometric/BiometricActivity.java new file mode 100644 index 0000000..0d6d20e --- /dev/null +++ b/platforms/android/app/src/main/java/de/niklasmerz/cordova/biometric/BiometricActivity.java @@ -0,0 +1,159 @@ +package de.niklasmerz.cordova.biometric; + +import android.app.Activity; +import android.app.KeyguardManager; +import android.content.Intent; +import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; +import android.support.v7.app.AppCompatActivity; + +import com.exxbrain.android.biometric.BiometricPrompt; + +import java.util.concurrent.Executor; + +public class BiometricActivity extends AppCompatActivity { + + private static final int REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS = 2; + private PromptInfo mPromptInfo; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setTitle(null); + int layout = getResources() + .getIdentifier("biometric_activity", "layout", getPackageName()); + setContentView(layout); + + if (savedInstanceState != null) { + return; + } + + mPromptInfo = new PromptInfo.Builder(getIntent().getExtras()).build(); + authenticate(); + + } + + private void authenticate() { + final Handler handler = new Handler(Looper.getMainLooper()); + Executor executor = handler::post; + + BiometricPrompt biometricPrompt = + new BiometricPrompt(this, executor, mAuthenticationCallback); + + BiometricPrompt.PromptInfo.Builder promptInfoBuilder = new BiometricPrompt.PromptInfo.Builder() + .setTitle(mPromptInfo.getTitle()) + .setSubtitle(mPromptInfo.getSubtitle()) + .setDescription(mPromptInfo.getDescription()); + + if (mPromptInfo.isDeviceCredentialAllowed() + && Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) { // TODO: remove after fix https://issuetracker.google.com/issues/142740104 + promptInfoBuilder.setDeviceCredentialAllowed(true); + } else { + promptInfoBuilder.setNegativeButtonText(mPromptInfo.getCancelButtonTitle()); + } + + biometricPrompt.authenticate(promptInfoBuilder.build()); + } + + private BiometricPrompt.AuthenticationCallback mAuthenticationCallback = + new BiometricPrompt.AuthenticationCallback() { + + @Override + public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) { + super.onAuthenticationError(errorCode, errString); + onError(errorCode, errString); + } + + @Override + public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) { + super.onAuthenticationSucceeded(result); + finishWithSuccess(); + } + + @Override + public void onAuthenticationFailed() { + super.onAuthenticationFailed(); + } + }; + + + // TODO: remove after fix https://issuetracker.google.com/issues/142740104 + private void showAuthenticationScreen() { + KeyguardManager keyguardManager = ContextCompat + .getSystemService(this, KeyguardManager.class); + if (keyguardManager == null + || android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) { + return; + } + if (keyguardManager.isKeyguardSecure()) { + Intent intent = keyguardManager + .createConfirmDeviceCredentialIntent(mPromptInfo.getTitle(), mPromptInfo.getDescription()); + this.startActivityForResult(intent, REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS); + } else { + // Show a message that the user hasn't set up a lock screen. + finishWithError(PluginError.BIOMETRIC_SCREEN_GUARD_UNSECURED); + } + } + + // TODO: remove after fix https://issuetracker.google.com/issues/142740104 + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode == REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS) { + if (resultCode == Activity.RESULT_OK) { + finishWithSuccess(); + } else { + finishWithError(PluginError.BIOMETRIC_PIN_OR_PATTERN_DISMISSED); + } + } + } + + private void onError(int errorCode, @NonNull CharSequence errString) { + + switch (errorCode) + { + case BiometricPrompt.ERROR_USER_CANCELED: + case BiometricPrompt.ERROR_CANCELED: + finishWithError(PluginError.BIOMETRIC_DISMISSED); + return; + case BiometricPrompt.ERROR_NEGATIVE_BUTTON: + // TODO: remove after fix https://issuetracker.google.com/issues/142740104 + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P && mPromptInfo.isDeviceCredentialAllowed()) { + showAuthenticationScreen(); + return; + } + finishWithError(PluginError.BIOMETRIC_DISMISSED); + break; + case BiometricPrompt.ERROR_LOCKOUT: + finishWithError(PluginError.BIOMETRIC_LOCKED_OUT.getValue(), errString.toString()); + break; + case BiometricPrompt.ERROR_LOCKOUT_PERMANENT: + finishWithError(PluginError.BIOMETRIC_LOCKED_OUT_PERMANENT.getValue(), errString.toString()); + break; + default: + finishWithError(errorCode, errString.toString()); + } + } + + private void finishWithSuccess() { + setResult(RESULT_OK); + finish(); + } + + private void finishWithError(PluginError error) { + finishWithError(error.getValue(), error.getMessage()); + } + + private void finishWithError(int code, String message) { + Intent data = new Intent(); + data.putExtra("code", code); + data.putExtra("message", message); + setResult(RESULT_CANCELED, data); + finish(); + } +} diff --git a/platforms/android/app/src/main/java/de/niklasmerz/cordova/biometric/Fingerprint.java b/platforms/android/app/src/main/java/de/niklasmerz/cordova/biometric/Fingerprint.java new file mode 100644 index 0000000..5bfe78e --- /dev/null +++ b/platforms/android/app/src/main/java/de/niklasmerz/cordova/biometric/Fingerprint.java @@ -0,0 +1,132 @@ +package de.niklasmerz.cordova.biometric; + +import android.app.Activity; +import android.content.Intent; +import android.os.Build; +import android.os.Bundle; +import android.util.Log; + +import com.exxbrain.android.biometric.BiometricManager; + +import org.apache.cordova.CallbackContext; +import org.apache.cordova.CordovaInterface; +import org.apache.cordova.CordovaPlugin; +import org.apache.cordova.CordovaWebView; +import org.apache.cordova.PluginResult; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +public class Fingerprint extends CordovaPlugin { + + private static final String TAG = "Fingerprint"; + private CallbackContext mCallbackContext = null; + + private static final int REQUEST_CODE_BIOMETRIC = 1; + private PromptInfo.Builder mPromptInfoBuilder; + + public void initialize(CordovaInterface cordova, CordovaWebView webView) { + super.initialize(cordova, webView); + Log.v(TAG, "Init Fingerprint"); + mPromptInfoBuilder = new PromptInfo.Builder(cordova.getActivity()); + } + + public boolean execute(final String action, JSONArray args, CallbackContext callbackContext) { + + this.mCallbackContext = callbackContext; + Log.v(TAG, "Fingerprint action: " + action); + + if (action.equals("authenticate")) { + executeAuthenticate(args); + return true; + + } else if (action.equals("isAvailable")){ + executeIsAvailable(); + return true; + } + + return false; + } + + private void executeIsAvailable() { + PluginError error = canAuthenticate(); + if (error != null) { + sendError(error); + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P){ + sendSuccess("biometric"); + } else { + sendSuccess("finger"); + } + } + + private void executeAuthenticate(JSONArray args) { + PluginError error = canAuthenticate(); + if (error != null) { + sendError(error); + return; + } + cordova.getActivity().runOnUiThread(() -> { + mPromptInfoBuilder.parseArgs(args); + Intent intent = new Intent(cordova.getActivity().getApplicationContext(), BiometricActivity.class); + intent.putExtras(mPromptInfoBuilder.build().getBundle()); + this.cordova.startActivityForResult(this, intent, REQUEST_CODE_BIOMETRIC); + }); + PluginResult pluginResult = new PluginResult(PluginResult.Status.NO_RESULT); + pluginResult.setKeepCallback(true); + this.mCallbackContext.sendPluginResult(pluginResult); + } + + @Override + public void onActivityResult(int requestCode, int resultCode, Intent intent) { + super.onActivityResult(requestCode, resultCode, intent); + if (requestCode != REQUEST_CODE_BIOMETRIC) { + return; + } + if (resultCode == Activity.RESULT_OK) { + sendSuccess("biometric_success"); + } else if (intent != null) { + Bundle extras = intent.getExtras(); + sendError(extras.getInt("code"), extras.getString("message")); + } else { + sendError(PluginError.BIOMETRIC_DISMISSED); + } + } + + private PluginError canAuthenticate() { + int error = BiometricManager.from(cordova.getContext()).canAuthenticate(); + switch (error) { + case BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE: + case BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE: + return PluginError.BIOMETRIC_HARDWARE_NOT_SUPPORTED; + case BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED: + return PluginError.BIOMETRIC_NOT_ENROLLED; + default: + return null; + } + } + + private void sendError(int code, String message) { + JSONObject resultJson = new JSONObject(); + try { + resultJson.put("code", code); + resultJson.put("message", message); + + PluginResult result = new PluginResult(PluginResult.Status.ERROR, resultJson); + result.setKeepCallback(true); + cordova.getActivity().runOnUiThread(() -> + Fingerprint.this.mCallbackContext.sendPluginResult(result)); + } catch (JSONException e) { + Log.e(TAG, e.getMessage(), e); + } + } + + private void sendError(PluginError error) { + sendError(error.getValue(), error.getMessage()); + } + + private void sendSuccess(String message) { + Log.e(TAG, message); + cordova.getActivity().runOnUiThread(() -> + this.mCallbackContext.success(message)); + } +} diff --git a/platforms/android/app/src/main/java/de/niklasmerz/cordova/biometric/PluginError.java b/platforms/android/app/src/main/java/de/niklasmerz/cordova/biometric/PluginError.java new file mode 100644 index 0000000..1a4a5db --- /dev/null +++ b/platforms/android/app/src/main/java/de/niklasmerz/cordova/biometric/PluginError.java @@ -0,0 +1,35 @@ +package de.niklasmerz.cordova.biometric; + +public enum PluginError { + + BIOMETRIC_AUTHENTICATION_FAILED(-102, "Authentication failed"), + BIOMETRIC_HARDWARE_NOT_SUPPORTED(-104), + BIOMETRIC_NOT_ENROLLED(-106), + BIOMETRIC_DISMISSED(-108), + BIOMETRIC_PIN_OR_PATTERN_DISMISSED(-109), + BIOMETRIC_SCREEN_GUARD_UNSECURED(-110, + "Go to 'Settings -> Security -> Screenlock' to set up a lock screen"), + BIOMETRIC_LOCKED_OUT(-111), + BIOMETRIC_LOCKED_OUT_PERMANENT(-112); + + private int value; + private String message; + + PluginError(int value) { + this.value = value; + this.message = this.name(); + } + + PluginError(int value, String message) { + this.value = value; + this.message = message; + } + + public int getValue() { + return value; + } + + public String getMessage() { + return message; + } +} diff --git a/platforms/android/app/src/main/java/de/niklasmerz/cordova/biometric/PromptInfo.java b/platforms/android/app/src/main/java/de/niklasmerz/cordova/biometric/PromptInfo.java new file mode 100644 index 0000000..31ed0dd --- /dev/null +++ b/platforms/android/app/src/main/java/de/niklasmerz/cordova/biometric/PromptInfo.java @@ -0,0 +1,136 @@ +package de.niklasmerz.cordova.biometric; + +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.os.Bundle; +import android.util.Log; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +class PromptInfo { + + private static final String DISABLE_BACKUP = "disableBackup"; + private static final String TITLE = "title"; + private static final String SUBTITLE = "subtitle"; + private static final String DESCRIPTION = "description"; + private static final String FALLBACK_BUTTON_TITLE = "fallbackButtonTitle"; + private static final String CANCEL_BUTTON_TITLE = "cancelButtonTitle"; + + private Bundle bundle = new Bundle(); + + Bundle getBundle() { + return bundle; + } + + String getTitle() { + return bundle.getString(TITLE); + } + + String getSubtitle() { + return bundle.getString(SUBTITLE); + } + + String getDescription() { + return bundle.getString(DESCRIPTION); + } + + boolean isDeviceCredentialAllowed() { + return !bundle.getBoolean(DISABLE_BACKUP); + } + + String getFallbackButtonTitle() { + return bundle.getString(FALLBACK_BUTTON_TITLE); + } + + String getCancelButtonTitle() { + return bundle.getString(CANCEL_BUTTON_TITLE); + } + + public static final class Builder { + private static final String TAG = "PromptInfo.Builder"; + private Bundle bundle; + private boolean disableBackup = false; + private String title; + private String subtitle = null; + private String description = null; + private String fallbackButtonTitle = "Use backup"; + private String cancelButtonTitle = "Cancel"; + + Builder(Context context) { + PackageManager packageManager = context.getPackageManager(); + try { + ApplicationInfo app = packageManager + .getApplicationInfo(context.getPackageName(), 0); + title = packageManager.getApplicationLabel(app) + " Biometric Sign On"; + } catch (PackageManager.NameNotFoundException e) { + title = "Biometric Sign On"; + } + } + + Builder(Bundle bundle) { + this.bundle = bundle; + } + + public PromptInfo build() { + PromptInfo promptInfo = new PromptInfo(); + + if (this.bundle != null) { + promptInfo.bundle = bundle; + return promptInfo; + } + + Bundle bundle = new Bundle(); + bundle.putString(SUBTITLE, this.subtitle); + bundle.putString(TITLE, this.title); + bundle.putString(DESCRIPTION, this.description); + bundle.putString(FALLBACK_BUTTON_TITLE, this.fallbackButtonTitle); + bundle.putString(CANCEL_BUTTON_TITLE, this.cancelButtonTitle); + bundle.putBoolean(DISABLE_BACKUP, this.disableBackup); + promptInfo.bundle = bundle; + + return promptInfo; + } + + void parseArgs(JSONArray args) { + JSONObject argsObject; + try { + argsObject = args.getJSONObject(0); + } catch (JSONException e) { + Log.e(TAG, "Can't parse args. Defaults will be used.", e); + return; + } + disableBackup = getBooleanArg(argsObject, DISABLE_BACKUP, disableBackup); + title = getStringArg(argsObject, TITLE, title); + subtitle = getStringArg(argsObject, SUBTITLE, subtitle); + description = getStringArg(argsObject, DESCRIPTION, description); + fallbackButtonTitle = getStringArg(argsObject, FALLBACK_BUTTON_TITLE, "Use Backup"); + cancelButtonTitle = getStringArg(argsObject, CANCEL_BUTTON_TITLE, "Cancel"); + } + + private Boolean getBooleanArg(JSONObject argsObject, String name, Boolean defaultValue) { + if (argsObject.has(name)){ + try { + return argsObject.getBoolean(name); + } catch (JSONException e) { + Log.e(TAG, "Can't parse '" + name + "'. Default will be used.", e); + } + } + return defaultValue; + } + + private String getStringArg(JSONObject argsObject, String name, String defaultValue) { + if (argsObject.optString(name) != null + && !argsObject.optString(name).isEmpty()){ + try { + return argsObject.getString(name); + } catch (JSONException e) { + Log.e(TAG, "Can't parse '" + name + "'. Default will be used.", e); + } + } + return defaultValue; + } + } +} diff --git a/platforms/android/app/src/main/java/de/niklasmerz/cordova/fingerprint/Fingerprint.java b/platforms/android/app/src/main/java/de/niklasmerz/cordova/fingerprint/Fingerprint.java deleted file mode 100644 index 32fd67c..0000000 --- a/platforms/android/app/src/main/java/de/niklasmerz/cordova/fingerprint/Fingerprint.java +++ /dev/null @@ -1,436 +0,0 @@ -/* - * Copyright (C) https://github.com/mjwheatley/cordova-plugin-android-fingerprint-auth - * Modifications copyright (C) 2016 Niklas Merz - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package de.niklasmerz.cordova.fingerprint; - -import org.apache.cordova.CordovaWebView; -import org.apache.cordova.CallbackContext; -import org.apache.cordova.CordovaPlugin; -import org.apache.cordova.CordovaInterface; - -import android.annotation.TargetApi; -import android.app.FragmentTransaction; -import android.app.KeyguardManager; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.hardware.fingerprint.FingerprintManager; -import android.os.Bundle; -import android.security.keystore.KeyGenParameterSpec; -import android.security.keystore.KeyPermanentlyInvalidatedException; -import android.security.keystore.KeyProperties; -import android.util.Base64; -import android.util.DisplayMetrics; -import android.util.Log; - -import org.apache.cordova.PluginResult; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.UnrecoverableKeyException; -import java.security.cert.CertificateException; -import java.util.Locale; - -import javax.crypto.BadPaddingException; -import javax.crypto.Cipher; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.KeyGenerator; -import javax.crypto.NoSuchPaddingException; -import javax.crypto.SecretKey; - -@TargetApi(23) -public class Fingerprint extends CordovaPlugin { - - public static final String TAG = "Fingerprint"; - public static String packageName; - - private static final String DIALOG_FRAGMENT_TAG = "FpAuthDialog"; - private static final String ANDROID_KEY_STORE = "AndroidKeyStore"; - - KeyguardManager mKeyguardManager; - FingerprintAuthenticationDialogFragment mFragment; - public static KeyStore mKeyStore; - public static KeyGenerator mKeyGenerator; - public static Cipher mCipher; - private FingerprintManager mFingerPrintManager; - - public static CallbackContext mCallbackContext; - public static PluginResult mPluginResult; - - /** - * Alias for our key in the Android Key Store - */ - private static String mClientId; - /** - * Used to encrypt token - */ - private static String mClientSecret; - - /** - * Options - */ - private static boolean mDisableBackup = false; - - /** - * Constructor. - */ - public Fingerprint() { - } - - /** - * Sets the context of the Command. This can then be used to do things like - * get file paths associated with the Activity. - * - * @param cordova The context of the main Activity. - * @param webView The CordovaWebView Cordova is running in. - */ - - public void initialize(CordovaInterface cordova, CordovaWebView webView) { - super.initialize(cordova, webView); - Log.v(TAG, "Init Fingerprint"); - packageName = cordova.getActivity().getApplicationContext().getPackageName(); - mPluginResult = new PluginResult(PluginResult.Status.NO_RESULT); - - if (android.os.Build.VERSION.SDK_INT < 23) { - return; - } - - mKeyguardManager = cordova.getActivity().getSystemService(KeyguardManager.class); - mFingerPrintManager = cordova.getActivity().getApplicationContext() - .getSystemService(FingerprintManager.class); - - try { - mKeyGenerator = KeyGenerator.getInstance( - KeyProperties.KEY_ALGORITHM_AES, ANDROID_KEY_STORE); - mKeyStore = KeyStore.getInstance(ANDROID_KEY_STORE); - - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException("Failed to get an instance of KeyGenerator", e); - } catch (NoSuchProviderException e) { - throw new RuntimeException("Failed to get an instance of KeyGenerator", e); - } catch (KeyStoreException e) { - throw new RuntimeException("Failed to get an instance of KeyStore", e); - } - - try { - mCipher = Cipher.getInstance(KeyProperties.KEY_ALGORITHM_AES + "/" - + KeyProperties.BLOCK_MODE_CBC + "/" - + KeyProperties.ENCRYPTION_PADDING_PKCS7); - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException("Failed to get an instance of Cipher", e); - } catch (NoSuchPaddingException e) { - throw new RuntimeException("Failed to get an instance of Cipher", e); - } - } - - /** - * Executes the request and returns PluginResult. - * - * @param action The action to execute. - * @param args JSONArry of arguments for the plugin. - * @param callbackContext The callback id used when calling back into JavaScript. - * @return A PluginResult object with a status and message. - */ - public boolean execute(final String action, - JSONArray args, - CallbackContext callbackContext) throws JSONException { - mCallbackContext = callbackContext; - Log.v(TAG, "Fingerprint action: " + action); - if (android.os.Build.VERSION.SDK_INT < 23) { - Log.e(TAG, "minimum SDK version 23 required"); - mPluginResult = new PluginResult(PluginResult.Status.ERROR); - mCallbackContext.error("minimum SDK version 23 required"); - mCallbackContext.sendPluginResult(mPluginResult); - return true; - } - - final JSONObject arg_object = args.getJSONObject(0); - - if (action.equals("authenticate")) { - if (!arg_object.has("clientId") || !arg_object.has("clientSecret")) { - mPluginResult = new PluginResult(PluginResult.Status.ERROR); - mCallbackContext.error("Missing required parameters"); - mCallbackContext.sendPluginResult(mPluginResult); - return true; - } - mClientId = arg_object.getString("clientId"); - mClientSecret = arg_object.getString("clientSecret"); - if (arg_object.has("disableBackup")) { - mDisableBackup = arg_object.getBoolean("disableBackup"); - } - // Set language - Resources res = cordova.getActivity().getResources(); - // Change locale settings in the app. - DisplayMetrics dm = res.getDisplayMetrics(); - Configuration conf = res.getConfiguration(); - //Do not change locale - res.updateConfiguration(conf, dm); - - if (isFingerprintAuthAvailable()) { - SecretKey key = getSecretKey(); - boolean isCipherInit = true; - if (key == null) { - if (createKey()) { - key = getSecretKey(); - } - } - if (key != null && !initCipher()) { - isCipherInit = false; - } - if (key != null) { - cordova.getActivity().runOnUiThread(new Runnable() { - public void run() { - // Set up the crypto object for later. The object will be authenticated by use - // of the fingerprint. - mFragment = new FingerprintAuthenticationDialogFragment(); - Bundle bundle = new Bundle(); - bundle.putBoolean("disableBackup", mDisableBackup); - mFragment.setArguments(bundle); - - if (initCipher()) { - mFragment.setCancelable(false); - // Show the fingerprint dialog. The user has the option to use the fingerprint with - // crypto, or you can fall back to using a server-side verified password. - mFragment.setCryptoObject(new FingerprintManager.CryptoObject(mCipher)); - FragmentTransaction transaction = cordova.getActivity().getFragmentManager().beginTransaction(); - transaction.add(mFragment, DIALOG_FRAGMENT_TAG); - transaction.commitAllowingStateLoss(); - } else { - if (!mDisableBackup) { - // This happens if the lock screen has been disabled or or a fingerprint got - // enrolled. Thus show the dialog to authenticate with their password - mFragment.setCryptoObject(new FingerprintManager - .CryptoObject(mCipher)); - mFragment.setStage(FingerprintAuthenticationDialogFragment - .Stage.NEW_FINGERPRINT_ENROLLED); - FragmentTransaction transaction = cordova.getActivity().getFragmentManager().beginTransaction(); - transaction.add(mFragment, DIALOG_FRAGMENT_TAG); - transaction.commitAllowingStateLoss(); - } else { - mCallbackContext.error("Failed to init Cipher and backup disabled."); - mPluginResult = new PluginResult(PluginResult.Status.ERROR); - mCallbackContext.sendPluginResult(mPluginResult); - } - } - } - }); - mPluginResult.setKeepCallback(true); - } else { - mCallbackContext.sendPluginResult(mPluginResult); - } - - } else { - mPluginResult = new PluginResult(PluginResult.Status.ERROR); - mCallbackContext.error("Fingerprint authentication not available"); - mCallbackContext.sendPluginResult(mPluginResult); - } - return true; - } else if (action.equals("isAvailable")) { - if(isFingerprintAuthAvailable() && mFingerPrintManager.isHardwareDetected() && mFingerPrintManager.hasEnrolledFingerprints()){ - mPluginResult = new PluginResult(PluginResult.Status.OK, "finger"); - mCallbackContext.success("finger"); - }else{ - mPluginResult = new PluginResult(PluginResult.Status.ERROR); - - if (mFingerPrintManager.isHardwareDetected() && !mFingerPrintManager.hasEnrolledFingerprints()) { - mCallbackContext.error("Fingerprint authentication not ready"); - } else { - mCallbackContext.error("Fingerprint authentication not available"); - } - } - mCallbackContext.sendPluginResult(mPluginResult); - return true; - } - return false; - } - - private boolean isFingerprintAuthAvailable() { - return mFingerPrintManager.isHardwareDetected() - && mFingerPrintManager.hasEnrolledFingerprints(); - } - - /** - * Initialize the {@link Cipher} instance with the created key in the {@link #createKey()} - * method. - * - * @return {@code true} if initialization is successful, {@code false} if the lock screen has - * been disabled or reset after the key was generated, or if a fingerprint got enrolled after - * the key was generated. - */ - private static boolean initCipher() { - boolean initCipher = false; - String errorMessage = ""; - String initCipherExceptionErrorPrefix = "Failed to init Cipher: "; - try { - SecretKey key = getSecretKey(); - mCipher.init(Cipher.ENCRYPT_MODE, key); - initCipher = true; - } catch (InvalidKeyException e) { - errorMessage = initCipherExceptionErrorPrefix + "InvalidKeyException: " + e.toString(); - - } - if (!initCipher) { - Log.e(TAG, errorMessage); - createKey(); - } - return initCipher; - } - - private static SecretKey getSecretKey() { - String errorMessage = ""; - String getSecretKeyExceptionErrorPrefix = "Failed to get SecretKey from KeyStore: "; - SecretKey key = null; - try { - mKeyStore.load(null); - key = (SecretKey) mKeyStore.getKey(mClientId, null); - } catch (KeyStoreException e) { - errorMessage = getSecretKeyExceptionErrorPrefix - + "KeyStoreException: " + e.toString();; - } catch (CertificateException e) { - errorMessage = getSecretKeyExceptionErrorPrefix - + "CertificateException: " + e.toString();; - } catch (UnrecoverableKeyException e) { - errorMessage = getSecretKeyExceptionErrorPrefix - + "UnrecoverableKeyException: " + e.toString();; - } catch (IOException e) { - errorMessage = getSecretKeyExceptionErrorPrefix - + "IOException: " + e.toString();; - } catch (NoSuchAlgorithmException e) { - errorMessage = getSecretKeyExceptionErrorPrefix - + "NoSuchAlgorithmException: " + e.toString();; - } - if (key == null) { - Log.e(TAG, errorMessage); - } - return key; - } - - /** - * Creates a symmetric key in the Android Key Store which can only be used after the user has - * authenticated with fingerprint. - */ - public static boolean createKey() { - String errorMessage = ""; - String createKeyExceptionErrorPrefix = "Failed to create key: "; - boolean isKeyCreated = false; - // The enrolling flow for fingerprint. This is where you ask the user to set up fingerprint - // for your flow. Use of keys is necessary if you need to know if the set of - // enrolled fingerprints has changed. - try { - mKeyStore.load(null); - // Set the alias of the entry in Android KeyStore where the key will appear - // and the constrains (purposes) in the constructor of the Builder - mKeyGenerator.init(new KeyGenParameterSpec.Builder(mClientId, - KeyProperties.PURPOSE_ENCRYPT | - KeyProperties.PURPOSE_DECRYPT) - .setBlockModes(KeyProperties.BLOCK_MODE_CBC) - // Require the user to authenticate with a fingerprint to authorize every use - // of the key - .setUserAuthenticationRequired(true) - .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7) - .build()); - mKeyGenerator.generateKey(); - isKeyCreated = true; - } catch (NoSuchAlgorithmException e) { - errorMessage = createKeyExceptionErrorPrefix - + "NoSuchAlgorithmException: " + e.toString();; - } catch (InvalidAlgorithmParameterException e) { - errorMessage = createKeyExceptionErrorPrefix - + "InvalidAlgorithmParameterException: " + e.toString();; - } catch (CertificateException e) { - errorMessage = createKeyExceptionErrorPrefix - + "CertificateException: " + e.toString();; - } catch (IOException e) { - errorMessage = createKeyExceptionErrorPrefix - + "IOException: " + e.toString();; - } - if (!isKeyCreated) { - Log.e(TAG, errorMessage); - setPluginResultError(errorMessage); - } - return isKeyCreated; - } - - public static void onAuthenticated(boolean withFingerprint) { - JSONObject resultJson = new JSONObject(); - String errorMessage = ""; - boolean createdResultJson = false; - try { - - if (withFingerprint) { - // If the user has authenticated with fingerprint, verify that using cryptography and - // then return the encrypted token - byte[] encrypted = tryEncrypt(); - resultJson.put("withFingerprint", Base64.encodeToString(encrypted, 0 /* flags */)); - } else { - // Authentication happened with backup password. - resultJson.put("withPassword", true); - - // if failed to init cipher because of InvalidKeyException, create new key - if (!initCipher()) { - createKey(); - } - } - createdResultJson = true; - } catch (BadPaddingException e) { - errorMessage = "Failed to encrypt the data with the generated key:" + - " BadPaddingException: " + e.getMessage(); - Log.e(TAG, errorMessage); - } catch (IllegalBlockSizeException e) { - errorMessage = "Failed to encrypt the data with the generated key: " + - "IllegalBlockSizeException: " + e.getMessage(); - Log.e(TAG, errorMessage); - } catch (JSONException e) { - errorMessage = "Failed to set resultJson key value pair: " + e.getMessage(); - Log.e(TAG, errorMessage); - } - - if (createdResultJson) { - mCallbackContext.success(resultJson); - mPluginResult = new PluginResult(PluginResult.Status.OK); - } else { - mCallbackContext.error(errorMessage); - mPluginResult = new PluginResult(PluginResult.Status.ERROR); - } - mCallbackContext.sendPluginResult(mPluginResult); - } - - public static void onCancelled() { - mCallbackContext.error("Cancelled"); - } - - /** - * Tries to encrypt some data with the generated key in {@link #createKey} which is - * only works if the user has just authenticated via fingerprint. - */ - private static byte[] tryEncrypt() throws BadPaddingException, IllegalBlockSizeException { - return mCipher.doFinal(mClientSecret.getBytes()); - } - - public static boolean setPluginResultError(String errorMessage) { - mCallbackContext.error(errorMessage); - mPluginResult = new PluginResult(PluginResult.Status.ERROR); - return false; - } -} \ No newline at end of file diff --git a/platforms/android/app/src/main/java/de/niklasmerz/cordova/fingerprint/FingerprintAuthenticationDialogFragment.java b/platforms/android/app/src/main/java/de/niklasmerz/cordova/fingerprint/FingerprintAuthenticationDialogFragment.java deleted file mode 100644 index 54fb28d..0000000 --- a/platforms/android/app/src/main/java/de/niklasmerz/cordova/fingerprint/FingerprintAuthenticationDialogFragment.java +++ /dev/null @@ -1,268 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * Modifications copyright (C) 2016 Niklas Merz - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package de.niklasmerz.cordova.fingerprint; - -import android.app.DialogFragment; -import android.app.KeyguardManager; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.SharedPreferences; -import android.hardware.fingerprint.FingerprintManager; -import android.os.Bundle; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.inputmethod.InputMethodManager; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.TextView; -import android.widget.Toast; - -/** - * A dialog which uses fingerprint APIs to authenticate the user, and falls back to password - * authentication if fingerprint is not available. - */ -public class FingerprintAuthenticationDialogFragment extends DialogFragment - implements FingerprintUiHelper.Callback { - - private static final String TAG = "FingerprintAuthDialog"; - private static final int REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS = 1; - - private Button mCancelButton; - private Button mSecondDialogButton; - private View mFingerprintContent; - - private Stage mStage = Stage.FINGERPRINT; - - private KeyguardManager mKeyguardManager; - private FingerprintManager.CryptoObject mCryptoObject; - private FingerprintUiHelper mFingerprintUiHelper; - FingerprintUiHelper.FingerprintUiHelperBuilder mFingerprintUiHelperBuilder; - - boolean disableBackup; - - public FingerprintAuthenticationDialogFragment() { - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - // Do not create a new Fragment when the Activity is re-created such as orientation changes. - setRetainInstance(true); - setStyle(DialogFragment.STYLE_NORMAL, android.R.style.Theme_Material_Light_Dialog); - - mKeyguardManager = (KeyguardManager) getContext().getSystemService(Context.KEYGUARD_SERVICE); - mFingerprintUiHelperBuilder = new FingerprintUiHelper.FingerprintUiHelperBuilder( - getContext(), getContext().getSystemService(FingerprintManager.class)); - - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - Bundle args = getArguments(); - disableBackup = args.getBoolean("disableBackup"); - Log.d(TAG, "disableBackup: " + disableBackup); - - int fingerprint_auth_dialog_title_id = getResources() - .getIdentifier("fingerprint_auth_dialog_title", "string", - Fingerprint.packageName); - getDialog().setTitle(getString(fingerprint_auth_dialog_title_id)); - int fingerprint_dialog_container_id = getResources() - .getIdentifier("fingerprint_dialog_container", "layout", - Fingerprint.packageName); - View v = inflater.inflate(fingerprint_dialog_container_id, container, false); - int cancel_button_id = getResources() - .getIdentifier("cancel_button", "id", Fingerprint.packageName); - mCancelButton = (Button) v.findViewById(cancel_button_id); - mCancelButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Fingerprint.onCancelled(); - dismissAllowingStateLoss(); - } - }); - - int second_dialog_button_id = getResources() - .getIdentifier("second_dialog_button", "id", Fingerprint.packageName); - mSecondDialogButton = (Button) v.findViewById(second_dialog_button_id); - if (disableBackup) { - mSecondDialogButton.setVisibility(View.GONE); - } - mSecondDialogButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - goToBackup(); - } - }); - int fingerprint_container_id = getResources() - .getIdentifier("fingerprint_container", "id", Fingerprint.packageName); - mFingerprintContent = v.findViewById(fingerprint_container_id); - - int new_fingerprint_enrolled_description_id = getResources() - .getIdentifier("new_fingerprint_enrolled_description", "id", - Fingerprint.packageName); - - int fingerprint_icon_id = getResources() - .getIdentifier("fingerprint_icon", "id", Fingerprint.packageName); - int fingerprint_status_id = getResources() - .getIdentifier("fingerprint_status", "id", Fingerprint.packageName); - mFingerprintUiHelper = mFingerprintUiHelperBuilder.build( - (ImageView) v.findViewById(fingerprint_icon_id), - (TextView) v.findViewById(fingerprint_status_id), this); - updateStage(); - - // If fingerprint authentication is not available, switch immediately to the backup - // (password) screen. - if (!mFingerprintUiHelper.isFingerprintAuthAvailable()) { - goToBackup(); - } - return v; - } - - - @Override - public void onResume() { - super.onResume(); - if (mStage == Stage.FINGERPRINT) { - mFingerprintUiHelper.startListening(mCryptoObject); - } - } - - public void setStage(Stage stage) { - mStage = stage; - } - - @Override - public void onPause() { - super.onPause(); - mFingerprintUiHelper.stopListening(); - } - - /** - * Sets the crypto object to be passed in when authenticating with fingerprint. - */ - public void setCryptoObject(FingerprintManager.CryptoObject cryptoObject) { - mCryptoObject = cryptoObject; - } - - /** - * Switches to backup (password) screen. This either can happen when fingerprint is not - * available or the user chooses to use the password authentication method by pressing the - * button. This can also happen when the user had too many fingerprint attempts. - */ - private void goToBackup() { - if(disableBackup) - { - Fingerprint.onCancelled(); - dismissAllowingStateLoss(); - } - else{ - mStage = Stage.BACKUP; - updateStage(); - } - } - - private void updateStage() { - int cancel_id = getResources() - .getIdentifier("fingerprint_cancel", "string", Fingerprint.packageName); - switch (mStage) { - case FINGERPRINT: - mCancelButton.setText(cancel_id); - int use_backup_id = getResources() - .getIdentifier("fingerprint_use_backup", "string", Fingerprint.packageName); - mSecondDialogButton.setText(use_backup_id); - mFingerprintContent.setVisibility(View.VISIBLE); - break; - case NEW_FINGERPRINT_ENROLLED: - // Intentional fall through - case BACKUP: - if (mStage == Stage.NEW_FINGERPRINT_ENROLLED) { - - } - if (!mKeyguardManager.isKeyguardSecure()) { - // Show a message that the user hasn't set up a lock screen. - int secure_lock_screen_required_id = getResources() - .getIdentifier("secure_lock_screen_required", "string", - Fingerprint.packageName); - Toast.makeText(getContext(), - getString(secure_lock_screen_required_id), - Toast.LENGTH_LONG).show(); - return; - } - showAuthenticationScreen(); - break; - } - } - - private void showAuthenticationScreen() { - // Create the Confirm Credentials screen. You can customize the title and description. Or - // we will provide a generic one for you if you leave it null - Intent intent = mKeyguardManager.createConfirmDeviceCredentialIntent(null, null); - if (intent != null) { - startActivityForResult(intent, REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS); - } - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS) { - // Challenge completed, proceed with using cipher - if (resultCode == getActivity().RESULT_OK) { - Fingerprint.onAuthenticated(false /* used backup */); - } else { - // The user canceled or didnât complete the lock screen - // operation. Go to error/cancellation flow. - Fingerprint.onCancelled(); - } - dismissAllowingStateLoss(); - } - } - - @Override - public void onAuthenticated() { - // Callback from FingerprintUiHelper. Let the activity know that authentication was - // successful. - Fingerprint.onAuthenticated(true /* withFingerprint */); - dismissAllowingStateLoss(); - } - - @Override - public void onError() { - if(this.getActivity() != null) - goToBackup(); - } - - @Override - public void onCancel(DialogInterface dialog) { - super.onCancel(dialog); - Fingerprint.onCancelled(); - } - - /** - * Enumeration to indicate which authentication method the user is trying to authenticate with. - */ - public enum Stage { - FINGERPRINT, - NEW_FINGERPRINT_ENROLLED, - BACKUP - } -} diff --git a/platforms/android/app/src/main/java/de/niklasmerz/cordova/fingerprint/FingerprintUiHelper.java b/platforms/android/app/src/main/java/de/niklasmerz/cordova/fingerprint/FingerprintUiHelper.java deleted file mode 100644 index e1402c5..0000000 --- a/platforms/android/app/src/main/java/de/niklasmerz/cordova/fingerprint/FingerprintUiHelper.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * Modifications copyright (C) 2016 Niklas Merz - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package de.niklasmerz.cordova.fingerprint; - -import android.annotation.TargetApi; -import android.content.Context; -import android.hardware.fingerprint.FingerprintManager; -import android.os.CancellationSignal; -import android.widget.ImageView; -import android.widget.TextView; - - -/** - * Small helper class to manage text/icon around fingerprint authentication UI. - */ -@TargetApi(23) -public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallback { - - static final long ERROR_TIMEOUT_MILLIS = 1600; - static final long SUCCESS_DELAY_MILLIS = 1300; - - private final Context mContext; - private final FingerprintManager mFingerprintManager; - private final ImageView mIcon; - private final TextView mErrorTextView; - private final Callback mCallback; - private CancellationSignal mCancellationSignal; - - boolean mSelfCancelled; - - /** - * Builder class for {@link FingerprintUiHelper} in which injected fields from Dagger - * holds its fields and takes other arguments in the {@link #build} method. - */ - public static class FingerprintUiHelperBuilder { - private final FingerprintManager mFingerPrintManager; - private final Context mContext; - - public FingerprintUiHelperBuilder(Context context, FingerprintManager fingerprintManager) { - mFingerPrintManager = fingerprintManager; - mContext = context; - } - - public FingerprintUiHelper build(ImageView icon, TextView errorTextView, Callback callback) { - return new FingerprintUiHelper(mContext, mFingerPrintManager, icon, errorTextView, - callback); - } - } - - /** - * Constructor for {@link FingerprintUiHelper}. This method is expected to be called from - * only the {@link FingerprintUiHelperBuilder} class. - */ - private FingerprintUiHelper(Context context, FingerprintManager fingerprintManager, - ImageView icon, TextView errorTextView, Callback callback) { - mFingerprintManager = fingerprintManager; - mIcon = icon; - mErrorTextView = errorTextView; - mCallback = callback; - mContext = context; - } - - public boolean isFingerprintAuthAvailable() { - return mFingerprintManager.isHardwareDetected() - && mFingerprintManager.hasEnrolledFingerprints(); - } - - public void startListening(FingerprintManager.CryptoObject cryptoObject) { - if (!isFingerprintAuthAvailable()) { - return; - } - mCancellationSignal = new CancellationSignal(); - mSelfCancelled = false; - mFingerprintManager - .authenticate(cryptoObject, mCancellationSignal, 0 /* flags */, this, null); - - int ic_fp_40px_id = mContext.getResources() - .getIdentifier("ic_fp_40px", "drawable", Fingerprint.packageName); - mIcon.setImageResource(ic_fp_40px_id); - } - - public void stopListening() { - if (mCancellationSignal != null) { - mSelfCancelled = true; - mCancellationSignal.cancel(); - mCancellationSignal = null; - } - } - - @Override - public void onAuthenticationError(int errMsgId, CharSequence errString) { - if (!mSelfCancelled) { - showError(errString); - mIcon.postDelayed(new Runnable() { - @Override - public void run() { - mCallback.onError(); - } - }, ERROR_TIMEOUT_MILLIS); - } - } - - @Override - public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) { - showError(helpString); - } - - @Override - public void onAuthenticationFailed() { - int fingerprint_not_recognized_id = mContext.getResources() - .getIdentifier("fingerprint_not_recognized", "string", Fingerprint.packageName); - showError(mIcon.getResources().getString( - fingerprint_not_recognized_id)); - } - - @Override - public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) { - mErrorTextView.removeCallbacks(mResetErrorTextRunnable); - int ic_fingerprint_success_id = mContext.getResources() - .getIdentifier("ic_fingerprint_success", "drawable", Fingerprint.packageName); - mIcon.setImageResource(ic_fingerprint_success_id); - int success_color_id = mContext.getResources() - .getIdentifier("success_color", "color", Fingerprint.packageName); - mErrorTextView.setTextColor( - mErrorTextView.getResources().getColor(success_color_id, null)); - int fingerprint_success_id = mContext.getResources() - .getIdentifier("fingerprint_success", "string", Fingerprint.packageName); - mErrorTextView.setText( - mErrorTextView.getResources().getString(fingerprint_success_id)); - mIcon.postDelayed(new Runnable() { - @Override - public void run() { - mCallback.onAuthenticated(); - } - }, SUCCESS_DELAY_MILLIS); - } - - private void showError(CharSequence error) { - int ic_fingerprint_error_id = mContext.getResources() - .getIdentifier("ic_fingerprint_error", "drawable", Fingerprint.packageName); - mIcon.setImageResource(ic_fingerprint_error_id); - mErrorTextView.setText(error); - int warning_color_id = mContext.getResources() - .getIdentifier("warning_color", "color", Fingerprint.packageName); - mErrorTextView.setTextColor( - mErrorTextView.getResources().getColor(warning_color_id, null)); - mErrorTextView.removeCallbacks(mResetErrorTextRunnable); - mErrorTextView.postDelayed(mResetErrorTextRunnable, ERROR_TIMEOUT_MILLIS); - } - - Runnable mResetErrorTextRunnable = new Runnable() { - @Override - public void run() { - int hint_color_id = mContext.getResources() - .getIdentifier("hint_color", "color", Fingerprint.packageName); - mErrorTextView.setTextColor( - mErrorTextView.getResources().getColor(hint_color_id, null)); - int fingerprint_hint_id = mContext.getResources() - .getIdentifier("fingerprint_hint", "string", Fingerprint.packageName); - mErrorTextView.setText( - mErrorTextView.getResources().getString(fingerprint_hint_id)); - int ic_fp_40px_id = mContext.getResources() - .getIdentifier("ic_fp_40px", "drawable", Fingerprint.packageName); - mIcon.setImageResource(ic_fp_40px_id); - } - }; - - public interface Callback { - - void onAuthenticated(); - - void onError(); - } -} diff --git a/platforms/android/app/src/main/res/drawable-hdpi/ic_fp_40px.png b/platforms/android/app/src/main/res/drawable-hdpi/ic_fp_40px.png deleted file mode 100644 index 48ebd8a..0000000 Binary files a/platforms/android/app/src/main/res/drawable-hdpi/ic_fp_40px.png and /dev/null differ diff --git a/platforms/android/app/src/main/res/drawable-hdpi/icon.png b/platforms/android/app/src/main/res/drawable-hdpi/icon.png index 1769fc5..a79c7cf 100644 Binary files a/platforms/android/app/src/main/res/drawable-hdpi/icon.png and b/platforms/android/app/src/main/res/drawable-hdpi/icon.png differ diff --git a/platforms/android/app/src/main/res/drawable-ldpi/icon.png b/platforms/android/app/src/main/res/drawable-ldpi/icon.png index 1769fc5..24166c6 100644 Binary files a/platforms/android/app/src/main/res/drawable-ldpi/icon.png and b/platforms/android/app/src/main/res/drawable-ldpi/icon.png differ diff --git a/platforms/android/app/src/main/res/drawable-mdpi/ic_fp_40px.png b/platforms/android/app/src/main/res/drawable-mdpi/ic_fp_40px.png deleted file mode 100644 index 122f442..0000000 Binary files a/platforms/android/app/src/main/res/drawable-mdpi/ic_fp_40px.png and /dev/null differ diff --git a/platforms/android/app/src/main/res/drawable-mdpi/icon.png b/platforms/android/app/src/main/res/drawable-mdpi/icon.png index 92a3334..613d8e7 100644 Binary files a/platforms/android/app/src/main/res/drawable-mdpi/icon.png and b/platforms/android/app/src/main/res/drawable-mdpi/icon.png differ diff --git a/platforms/android/app/src/main/res/drawable-nodpi/android_robot.png b/platforms/android/app/src/main/res/drawable-nodpi/android_robot.png deleted file mode 100644 index 40bf934..0000000 Binary files a/platforms/android/app/src/main/res/drawable-nodpi/android_robot.png and /dev/null differ diff --git a/platforms/android/app/src/main/res/drawable-xhdpi/ic_fp_40px.png b/platforms/android/app/src/main/res/drawable-xhdpi/ic_fp_40px.png deleted file mode 100644 index e1c9590..0000000 Binary files a/platforms/android/app/src/main/res/drawable-xhdpi/ic_fp_40px.png and /dev/null differ diff --git a/platforms/android/app/src/main/res/drawable-xhdpi/icon.png b/platforms/android/app/src/main/res/drawable-xhdpi/icon.png index 4f54d23..1737ab8 100644 Binary files a/platforms/android/app/src/main/res/drawable-xhdpi/icon.png and b/platforms/android/app/src/main/res/drawable-xhdpi/icon.png differ diff --git a/platforms/android/app/src/main/res/drawable-xxhdpi/ic_fp_40px.png b/platforms/android/app/src/main/res/drawable-xxhdpi/ic_fp_40px.png deleted file mode 100644 index f7e8724..0000000 Binary files a/platforms/android/app/src/main/res/drawable-xxhdpi/ic_fp_40px.png and /dev/null differ diff --git a/platforms/android/app/src/main/res/drawable-xxhdpi/icon.png b/platforms/android/app/src/main/res/drawable-xxhdpi/icon.png index ea73508..a8c7b45 100644 Binary files a/platforms/android/app/src/main/res/drawable-xxhdpi/icon.png and b/platforms/android/app/src/main/res/drawable-xxhdpi/icon.png differ diff --git a/platforms/android/app/src/main/res/drawable-xxxhdpi/ic_fp_40px.png b/platforms/android/app/src/main/res/drawable-xxxhdpi/ic_fp_40px.png deleted file mode 100644 index 0fb8545..0000000 Binary files a/platforms/android/app/src/main/res/drawable-xxxhdpi/ic_fp_40px.png and /dev/null differ diff --git a/platforms/android/app/src/main/res/drawable-xxxhdpi/icon.png b/platforms/android/app/src/main/res/drawable-xxxhdpi/icon.png index 8b754c8..5b33488 100644 Binary files a/platforms/android/app/src/main/res/drawable-xxxhdpi/icon.png and b/platforms/android/app/src/main/res/drawable-xxxhdpi/icon.png differ diff --git a/platforms/android/app/src/main/res/drawable/ic_fingerprint_error.xml b/platforms/android/app/src/main/res/drawable/ic_fingerprint_error.xml deleted file mode 100644 index be46116..0000000 --- a/platforms/android/app/src/main/res/drawable/ic_fingerprint_error.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - diff --git a/platforms/android/app/src/main/res/drawable/ic_fingerprint_success.xml b/platforms/android/app/src/main/res/drawable/ic_fingerprint_success.xml deleted file mode 100644 index 261f3e7..0000000 --- a/platforms/android/app/src/main/res/drawable/ic_fingerprint_success.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - diff --git a/platforms/android/app/src/main/res/layout/biometric_activity.xml b/platforms/android/app/src/main/res/layout/biometric_activity.xml new file mode 100644 index 0000000..5708761 --- /dev/null +++ b/platforms/android/app/src/main/res/layout/biometric_activity.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/platforms/android/app/src/main/res/layout/fingerprint_dialog_container.xml b/platforms/android/app/src/main/res/layout/fingerprint_dialog_container.xml deleted file mode 100644 index 0c6face..0000000 --- a/platforms/android/app/src/main/res/layout/fingerprint_dialog_container.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - -