diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f09c0306a..f957b3882 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index c874f22da..86cc0c2fd 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/build.gradle b/app/build.gradle index 4f620a6bc..247ab6aad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId = 'com.wagerrwallet' minSdkVersion 23 targetSdkVersion 28 - versionCode 246 - versionName "246" + versionCode 247 + versionName "247" multiDexEnabled true // Similar to other properties in the defaultConfig block, diff --git a/app/src/main/java/com/wagerrwallet/tools/util/Utils.java b/app/src/main/java/com/wagerrwallet/tools/util/Utils.java index a96738910..f2de0edc6 100644 --- a/app/src/main/java/com/wagerrwallet/tools/util/Utils.java +++ b/app/src/main/java/com/wagerrwallet/tools/util/Utils.java @@ -161,8 +161,12 @@ public static byte[] hexToBytes(String s) { public static boolean isFingerprintEnrolled(Context app) { FingerprintManager fingerprintManager = (FingerprintManager) app.getSystemService(FINGERPRINT_SERVICE); - // Device doesn't support fingerprint authentication - return ActivityCompat.checkSelfPermission(app, Manifest.permission.USE_FINGERPRINT) == PackageManager.PERMISSION_GRANTED && fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints(); + if (fingerprintManager==null) { // Device doesn't support fingerprint authentication + return false; + } + else { + return ActivityCompat.checkSelfPermission(app, Manifest.permission.USE_FINGERPRINT) == PackageManager.PERMISSION_GRANTED && fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints(); + } } public static boolean isFingerprintAvailable(Context app) { diff --git a/app/src/main/jni/breadwallet-core b/app/src/main/jni/breadwallet-core index 25fe0ac45..7ec79402b 160000 --- a/app/src/main/jni/breadwallet-core +++ b/app/src/main/jni/breadwallet-core @@ -1 +1 @@ -Subproject commit 25fe0ac459c948aac70a504f83e763181cdb677c +Subproject commit 7ec79402bd32973ffee14b3bc700d80b8b84ed21