From f25695990a37db209fe9a6250b7456c9da8f5c56 Mon Sep 17 00:00:00 2001 From: MIPPL Date: Sun, 3 Nov 2019 21:04:46 +0100 Subject: [PATCH] fix balanceUpdate, fix crash on fingerprint service not found, b 247 --- .idea/caches/build_file_checksums.ser | Bin 539 -> 539 bytes .idea/caches/gradle_models.ser | Bin 250599 -> 250599 bytes app/build.gradle | 4 ++-- .../com/wagerrwallet/tools/util/Utils.java | 8 ++++++-- app/src/main/jni/breadwallet-core | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f09c0306a6a6d99562ee8947a940d1317a81e17a..f957b3882ae45288710ee42b40c6eb23822928fe 100644 GIT binary patch delta 35 tcmV+;0NnqZ1e*kqm;^A^3MrACcM#D~=o-(UE{@ZE)zU8su{o0?0r&_H4{iVe delta 35 tcmV+;0NnqZ1e*kqm;@?4t!cMyFaZv8{lusM(Y-hnN5xOkHz0r(CD5G4Qr diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index c874f22da266609b35944bcb00f5c31cbc8d0900..86cc0c2fd2c047d97c209082d57d1ecc3b150e9c 100644 GIT binary patch delta 905 zcmX|9drZ?;6z2AK+NvnT;lQDZWonl!Ba}z_*a86)2?8w$f>Eg{1xBen${XFPL`AJY zH5}-jSWK&H$eeWGUD7R6z>Ni&qQU6mgZYRL&@{3J*^;TupGExhp6`6$x##=Nge!Q$ z72NwO1y03`y3TG`L_pr4FJwWfIsyw5XdaeU8}N2o_?j4{OsOx>$41Hv6tc)Txn3Wc zFH;;@|3i2$l4#pksfLa2!-` zLPI|P``8B9~OmcVoSjS6aw7Wft0ik+}Jt;I?+Lgx#Cs4`HPY}|N+I%nT$ zYfBtpmga^tVw4bYhUhlaJ{3^e!XShA`Nzxo`f0Gx-ow99q2Bz!H=t^ zHM}_n>@By!_&s6ITqq9HYV=eb2a7d1ZZ0^J=_#DPm0Za)4LDUV#6K$AVWlqjDDUW8 z;cC?}-~wl=SZTF@z;tcZ6j~d~@LtU~@KEt^lx7U@*YH+&vKAq@L^MrhmHZMWQ#N|* zC_Jlnou40-jW6nLAW<4Sn6*Jj;6Lq8xA|)2vwr-z&$# z;dm?=cC%$eLjnjBiKA#z9RE8WVpm600`|eh62i{@swG@iKolj1xG>BfUCutg>|P6Z zU)w+1=k*=*`iRHt6Lh!1hnJd?=!y|8-gA9FmnUAJQfIn%^F(ZH4)jn%S J?`7_#@C`g_f=2)V delta 874 zcmX|OLAoNG*aW*0)pTN(g)j6mu*5I>6k2tqsI;JeOLED*#H`ufEH=OK@HZouKU;?VQeT_W+3yN*dC_lP(xfRO7tLps| zOe-ijlFJO1oty$iE#t6sWgT>Mdn&LwzY=Y^$6&ZS>=m1z7e(NTXTnHSs4MZ~Dl06z z=(bT0<%gHAGGIi$8H&;-DOq#=L;|;`dD^Kj<6ljstc81yRkJD8|q(&=y+0tA4`OI*HjB3>qG~5NBa}^*B^n;p{;tR zD;5yw+CKX|R&Unh%MFL&Y2x`iG_95YhQGq^HX?AQ2R$^_#4lkqW}L|Qb5{lju(Nmb2=m@-7cl3Id4wgks|dT$ zRwdxp50X%_j|<1ldl76_M^g;!?HnQ8<@N3L`iRTx6P!8(x4sI$(J}4Z9M_`?E;nGv eP@l}aod>b}K%^_PZ 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