Update

Author: SeniorZhai

app/src/main/assets/captcha.html

@@ -37,11 +37,10 @@
                 product: 'bind'
             }, function(captcha) {
                 captcha.onReady(function(){
-                    postMessage("challenge_change");
                     captcha.showCaptcha();
                 }).onSuccess(function(){
                     var result = captcha.getValidate();
-                    postToken(result);
+                    postToken(JSON.stringify(result));
                 }).onClose(function () {
                     postMessage("gt_close");
                 });

app/src/main/java/one/mixin/android/ui/landing/GTCaptcha4Utils.kt

@@ -0,0 +1,30 @@
+package one.mixin.android.ui.landing
+
+import com.google.gson.Gson
+import com.google.gson.JsonObject
+import com.google.gson.JsonSyntaxException
+import com.google.gson.annotations.SerializedName
+import one.mixin.android.util.GsonHelper
+
+data class GTCaptcha4Result(
+    @SerializedName("lot_number")
+    val lotNumber: String?,
+    @SerializedName("captcha_output")
+    val captchaOutput: String?,
+    @SerializedName("pass_token")
+    val passToken: String?,
+    @SerializedName("gen_time")
+    val genTime: String?,
+)
+
+object GTCaptcha4Utils {
+    fun parseGTCaptchaResponse(json: String): GTCaptcha4Result? {
+        return try {
+            return GsonHelper.customGson.fromJson(json, GTCaptcha4Result::class.java)
+        } catch (e: JsonSyntaxException) {
+            e.printStackTrace()
+            null
+        }
+    }
+}
+

app/src/main/java/one/mixin/android/ui/landing/MobileFragment.kt

@@ -256,7 +256,11 @@ class MobileFragment: BaseFragment(R.layout.fragment_mobile) {
             } else if (captchaResponse.first.isH()) {
                 verificationRequest.hCaptchaResponse = captchaResponse.second
             } else {
-              // Todo
+                val t = GTCaptcha4Utils.parseGTCaptchaResponse(captchaResponse.second)
+                verificationRequest.lotNumber = t?.lotNumber
+                verificationRequest.captchaOutput = t?.captchaOutput
+                verificationRequest.passToken = t?.passToken
+                verificationRequest.genTime = t?.genTime
             }
         }
         binding.continueBn.displayedChild = 1

app/src/main/java/one/mixin/android/ui/landing/MobileViewModel.kt

@@ -98,7 +98,7 @@ internal constructor(
     }
 
     suspend fun anonymousRequest(publicKeyHex: String, messageHex: String, signatureHex: String, hCaptchaResponse: String? = null, gRecaptchaResponse: String? = null, gtRecaptchaResponse: String? = null): MixinResponse<VerificationResponse> {
-//        val gt = gtRecaptchaResponse?.let { GTCaptcha4Utils.parseGTCaptchaResponse(it) }
+        val gt = gtRecaptchaResponse?.let { GTCaptcha4Utils.parseGTCaptchaResponse(it) }
         val r = accountRepository.verification(
             VerificationRequest(
                 purpose = VerificationPurpose.ANONYMOUS_SESSION.name,
@@ -107,10 +107,10 @@ internal constructor(
                 masterSignatureHex = signatureHex,
                 hCaptchaResponse = hCaptchaResponse,
                 gRecaptchaResponse = gRecaptchaResponse,
-//                lotNumber = gt?.lotNumber,
-//                captchaOutput = gt?.captchaOutput,
-//                passToken = gt?.passToken,
-//                genTime = gt?.genTime,
+                lotNumber = gt?.lotNumber,
+                captchaOutput = gt?.captchaOutput,
+                passToken = gt?.passToken,
+                genTime = gt?.genTime,
             )
         )
         return r

app/src/main/java/one/mixin/android/ui/landing/VerificationFragment.kt

@@ -319,7 +319,11 @@ class VerificationFragment : PinCodeFragment(R.layout.fragment_verification) {
             } else if (captchaResponse.first.isH()) {
                 verificationRequest.hCaptchaResponse = captchaResponse.second
             } else {
-               //Todo
+                val t = GTCaptcha4Utils.parseGTCaptchaResponse(captchaResponse.second)
+                verificationRequest.lotNumber = t?.lotNumber
+                verificationRequest.captchaOutput = t?.captchaOutput
+                verificationRequest.passToken = t?.passToken
+                verificationRequest.genTime = t?.genTime
             }
         }
         viewModel.verification(verificationRequest)

app/src/main/java/one/mixin/android/ui/setting/delete/DeleteAccountFragment.kt

@@ -27,6 +27,7 @@ import one.mixin.android.ui.common.BaseFragment
 import one.mixin.android.ui.common.VerifyBottomSheetDialogFragment
 import one.mixin.android.ui.common.VerifyFragment
 import one.mixin.android.ui.home.MainActivity
+import one.mixin.android.ui.landing.GTCaptcha4Utils
 import one.mixin.android.ui.landing.MobileFragment.Companion.FROM_DELETE_ACCOUNT
 import one.mixin.android.ui.landing.VerificationFragment
 import one.mixin.android.ui.setting.LogoutPinBottomSheetDialogFragment
@@ -188,6 +189,11 @@ class DeleteAccountFragment : BaseFragment(R.layout.fragment_delete_account) {
             } else if (captchaResponse.first.isH()) {
                 verificationRequest.hCaptchaResponse = captchaResponse.second
             } else if (captchaResponse.first.isGT()) {
+                val t = GTCaptcha4Utils.parseGTCaptchaResponse(captchaResponse.second)
+                verificationRequest.lotNumber = t?.lotNumber
+                verificationRequest.captchaOutput = t?.captchaOutput
+                verificationRequest.passToken = t?.passToken
+                verificationRequest.genTime = t?.genTime
             }
         }
         binding.deleteCover.isVisible = true

app/src/main/java/one/mixin/android/widget/CaptchaView.kt

@@ -166,7 +166,7 @@ class CaptchaView(private val context: Context, private val callback: Callback)
 
             webView.clearCache(true)
             webView.loadDataWithBaseURL(Constants.API.DOMAIN, html, "text/html", "UTF-8", null)
-//            runOnUiThread(stopWebViewRunnable, WEB_VIEW_TIME_OUT)
+            runOnUiThread(stopWebViewRunnable, WEB_VIEW_TIME_OUT)
         }
     }
 
@@ -181,9 +181,9 @@ class CaptchaView(private val context: Context, private val callback: Callback)
     fun postMessage(
         @Suppress("UNUSED_PARAMETER") value: String,
     ) {
-        Timber.e("postMessage: $value")
-//        cancelRunOnUiThread(stopWebViewRunnable)
-//        runOnUiThread(stopWebViewRunnable)
+        if (value.isBlank()) return
+        cancelRunOnUiThread(stopWebViewRunnable)
+        runOnUiThread(stopWebViewRunnable)
     }
 
     @Suppress("unused")