Fixed fingerprint identify not shown on WeChat withdraw

eritpchy · Nov 19, 2023 · ad18770 · ad18770
1 parent dd208b8
commit ad18770
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 33
         versionCode 30
-        versionName "4.99.9"
+        versionName "4.99.10"
         buildConfigField "String", "APP_PRODUCT_NAME", "\"FingerprintPay\""
     }
 

diff --git a/app/src/main/java/com/surcumference/fingerprint/plugin/impl/wechat/WeChatBasePlugin.java b/app/src/main/java/com/surcumference/fingerprint/plugin/impl/wechat/WeChatBasePlugin.java
@@ -330,9 +330,12 @@ public void onWindowDetached() {
                 if (fingerPrintLayoutLast != null) {
                     passwordLayout.removeView(fingerPrintLayoutLast);
                 }
-                fingerPrintLayout.setVisibility(View.GONE);
+                // 禁止修改, 会导致layoutListener 再次调用 switchToFingerprintRunnable
+                // onPayDialogShown 调用 initFingerPrintLock
+                // switchToFingerprintRunnable 调用 initFingerPrintLock 导致 onFailed 调用 switchToPasswordRunnable
+                // switchToPasswordRunnable 调用 cancelFingerprintIdentify cancel 掉当前, 最终导致全部指纹识别取消
+                // fingerPrintLayout.setVisibility(View.GONE);
                 passwordLayout.addView(fingerPrintLayout);
-                passwordLayout.post(() -> fingerPrintLayout.setVisibility(View.VISIBLE));
                 // ensure image icon visibility
                 Task.onMain(1000, fingerPrintLayout::requestLayout);
                 passwordLayout.setClipChildren(false);
@@ -502,7 +505,7 @@ protected void stopAndRemoveCurrentActivityViewObserver() {
     }
 
     private void cancelFingerprintIdentify() {
-        L.d("cancelFingerprintIdentify");
+        L.d("cancelFingerprintIdentify", new Exception());
         XBiometricIdentify fingerprintIdentify = mFingerprintIdentify;
         if (fingerprintIdentify == null) {
             return;
@@ -511,6 +514,7 @@ private void cancelFingerprintIdentify() {
             return;
         }
         fingerprintIdentify.cancelIdentify();
+        mFingerprintIdentify = null;
     }
 
     protected void doSettingsMenuInject(final Activity activity) {