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

app/src/main/java/com/m2049r/xmrwallet/util/FingerprintHelper.java

@@ -2,18 +2,21 @@ package com.m2049r.xmrwallet.util;
 
 import android.app.KeyguardManager;
 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 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() &&
                 fingerprintManager.isHardwareDetected() &&
                 fingerprintManager.hasEnrolledFingerprints();
@@ -29,8 +32,14 @@ public class FingerprintHelper {
     }
 
     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);
+        }
     }
 }

app/src/main/java/com/m2049r/xmrwallet/util/Helper.java

@@ -31,11 +31,12 @@ import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.VectorDrawable;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.Build;
+import android.os.CancellationSignal;
 import android.os.Environment;
 import android.support.design.widget.TextInputLayout;
 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.Os;
 import android.text.Editable;
@@ -397,10 +398,6 @@ public class Helper {
         final boolean fingerprintAuthAllowed = !fingerprintDisabled && fingerprintAuthCheck;
         final CancellationSignal cancelSignal = new CancellationSignal();
 
-        if (fingerprintAuthAllowed) {
-            promptsView.findViewById(R.id.txtFingerprintAuth).setVisibility(View.VISIBLE);
-        }
-
         etPassword.getEditText().addTextChangedListener(new TextWatcher() {
 
             @Override
@@ -436,14 +433,18 @@ public class Helper {
                         });
         openDialog = alertDialogBuilder.create();
 
-        final FingerprintManagerCompat.AuthenticationCallback fingerprintAuthCallback = new FingerprintManagerCompat.AuthenticationCallback() {
+        final FingerprintManager.AuthenticationCallback fingerprintAuthCallback;
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            fingerprintAuthCallback = null;
+        } else {
+            fingerprintAuthCallback = new FingerprintManager.AuthenticationCallback() {
                 @Override
                 public void onAuthenticationError(int errMsgId, CharSequence errString) {
                     ((TextView) promptsView.findViewById(R.id.txtFingerprintAuth)).setText(errString);
                 }
 
                 @Override
-            public void onAuthenticationSucceeded(FingerprintManagerCompat.AuthenticationResult result) {
+                public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
                     try {
                         String userPass = KeyStoreHelper.loadWalletUserPass(context, wallet);
                         if (Helper.processPasswordEntry(context, wallet, userPass, true, action)) {
@@ -465,11 +466,13 @@ public class Helper {
                             .setText(context.getString(R.string.bad_fingerprint));
                 }
             };
+        }
 
         openDialog.setOnShowListener(new DialogInterface.OnShowListener() {
             @Override
             public void onShow(DialogInterface dialog) {
-                if (fingerprintAuthAllowed) {
+                if (fingerprintAuthAllowed && fingerprintAuthCallback != null) {
+                    promptsView.findViewById(R.id.txtFingerprintAuth).setVisibility(View.VISIBLE);
                     FingerprintHelper.authenticate(context, cancelSignal, fingerprintAuthCallback);
                 }
                 Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);