wownero
/
wownerujo
Archived
4
0
Fork 0
Code Releases 19 Activity

Use FingerprintManager instead of FingerprintManagerCompat (Fix #300) (#302)

Browse Source
upstream
0140454 6 years ago committed by m2049r
parent 7627e15a48
commit 74ba36de26
2 changed files with 53 additions and 41 deletions
Show Stats Download Patch File Download Diff File

29
app/src/main/java/com/m2049r/xmrwallet/util/FingerprintHelper.java
Unescape View File

@ -2,18 +2,21 @@ package com.m2049r.xmrwallet.util;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.content.Context; import android.content.Context;
import android.support.v4.hardware.fingerprint.FingerprintManagerCompat; import android.hardware.fingerprint.FingerprintManager;
import android.support.v4.os.CancellationSignal; import android.os.Build;
import android.os.CancellationSignal;
import timber.log.Timber;
public class FingerprintHelper { public class FingerprintHelper {
public static boolean isDeviceSupported(Context context) { public static boolean isDeviceSupported(Context context) {
FingerprintManagerCompat fingerprintManager = FingerprintManagerCompat.from(context); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE); return false;
}
FingerprintManager fingerprintManager = context.getSystemService(FingerprintManager.class);
KeyguardManager keyguardManager = context.getSystemService(KeyguardManager.class);
return keyguardManager != null && return (keyguardManager != null) && (fingerprintManager != null) &&
keyguardManager.isKeyguardSecure() && keyguardManager.isKeyguardSecure() &&
fingerprintManager.isHardwareDetected() && fingerprintManager.isHardwareDetected() &&
fingerprintManager.hasEnrolledFingerprints(); fingerprintManager.hasEnrolledFingerprints();
@ -29,8 +32,14 @@ public class FingerprintHelper {
} }
public static void authenticate(Context context, CancellationSignal cancelSignal, public static void authenticate(Context context, CancellationSignal cancelSignal,
FingerprintManagerCompat.AuthenticationCallback callback) { FingerprintManager.AuthenticationCallback callback) {
FingerprintManagerCompat manager = FingerprintManagerCompat.from(context); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
manager.authenticate(null, 0, cancelSignal, callback, null); return;
}
FingerprintManager manager = context.getSystemService(FingerprintManager.class);
if (manager != null) {
manager.authenticate(null, cancelSignal, 0, callback, null);
}
} }
} }

65
app/src/main/java/com/m2049r/xmrwallet/util/Helper.java
Unescape View File

@ -31,11 +31,12 @@ import android.graphics.Canvas;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.VectorDrawable; import android.graphics.drawable.VectorDrawable;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Build;
import android.os.CancellationSignal;
import android.os.Environment; import android.os.Environment;
import android.support.design.widget.TextInputLayout; import android.support.design.widget.TextInputLayout;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v4.hardware.fingerprint.FingerprintManagerCompat;
import android.support.v4.os.CancellationSignal;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Os; import android.system.Os;
import android.text.Editable; import android.text.Editable;
@ -397,10 +398,6 @@ public class Helper {
final boolean fingerprintAuthAllowed = !fingerprintDisabled && fingerprintAuthCheck; final boolean fingerprintAuthAllowed = !fingerprintDisabled && fingerprintAuthCheck;
final CancellationSignal cancelSignal = new CancellationSignal(); final CancellationSignal cancelSignal = new CancellationSignal();
if (fingerprintAuthAllowed) {
promptsView.findViewById(R.id.txtFingerprintAuth).setVisibility(View.VISIBLE);
}
etPassword.getEditText().addTextChangedListener(new TextWatcher() { etPassword.getEditText().addTextChangedListener(new TextWatcher() {
@Override @Override
@ -436,40 +433,46 @@ public class Helper {
}); });
openDialog = alertDialogBuilder.create(); openDialog = alertDialogBuilder.create();
final FingerprintManagerCompat.AuthenticationCallback fingerprintAuthCallback = new FingerprintManagerCompat.AuthenticationCallback() { final FingerprintManager.AuthenticationCallback fingerprintAuthCallback;
@Override if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
public void onAuthenticationError(int errMsgId, CharSequence errString) { fingerprintAuthCallback = null;
((TextView) promptsView.findViewById(R.id.txtFingerprintAuth)).setText(errString); } else {
} fingerprintAuthCallback = new FingerprintManager.AuthenticationCallback() {
@Override
public void onAuthenticationError(int errMsgId, CharSequence errString) {
((TextView) promptsView.findViewById(R.id.txtFingerprintAuth)).setText(errString);
}
@Override @Override
public void onAuthenticationSucceeded(FingerprintManagerCompat.AuthenticationResult result) { public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
try { try {
String userPass = KeyStoreHelper.loadWalletUserPass(context, wallet); String userPass = KeyStoreHelper.loadWalletUserPass(context, wallet);
if (Helper.processPasswordEntry(context, wallet, userPass, true, action)) { if (Helper.processPasswordEntry(context, wallet, userPass, true, action)) {
Helper.hideKeyboardAlways((Activity) context); Helper.hideKeyboardAlways((Activity) context);
openDialog.dismiss(); openDialog.dismiss();
openDialog = null; openDialog = null;
} else { } else {
etPassword.setError(context.getString(R.string.bad_password));
}
} catch (KeyStoreHelper.BrokenPasswordStoreException ex) {
etPassword.setError(context.getString(R.string.bad_password)); etPassword.setError(context.getString(R.string.bad_password));
// TODO: better errror message here - what would it be?
} }
} catch (KeyStoreHelper.BrokenPasswordStoreException ex) {
etPassword.setError(context.getString(R.string.bad_password));
// TODO: better errror message here - what would it be?
} }
}
@Override @Override
public void onAuthenticationFailed() { public void onAuthenticationFailed() {
((TextView) promptsView.findViewById(R.id.txtFingerprintAuth)) ((TextView) promptsView.findViewById(R.id.txtFingerprintAuth))
.setText(context.getString(R.string.bad_fingerprint)); .setText(context.getString(R.string.bad_fingerprint));
} }
}; };
}
openDialog.setOnShowListener(new DialogInterface.OnShowListener() { openDialog.setOnShowListener(new DialogInterface.OnShowListener() {
@Override @Override
public void onShow(DialogInterface dialog) { public void onShow(DialogInterface dialog) {
if (fingerprintAuthAllowed) { if (fingerprintAuthAllowed && fingerprintAuthCallback != null) {
promptsView.findViewById(R.id.txtFingerprintAuth).setVisibility(View.VISIBLE);
FingerprintHelper.authenticate(context, cancelSignal, fingerprintAuthCallback); FingerprintHelper.authenticate(context, cancelSignal, fingerprintAuthCallback);
} }
Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE); Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);