From 26a375f84d0cfee05b98a4b7f385479e6fd24f23 Mon Sep 17 00:00:00 2001
From: DASHU <385321165@qq.com>
Date: Mon, 25 Nov 2024 12:27:48 +0800
Subject: [PATCH] remote id blank check from android sign

---
 lib/provider/android_signer_content_resolver_provider.dart | 2 ++
 lib/provider/android_signer_mixin.dart                     | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/provider/android_signer_content_resolver_provider.dart b/lib/provider/android_signer_content_resolver_provider.dart
index 6923e5c..75075fe 100644
--- a/lib/provider/android_signer_content_resolver_provider.dart
+++ b/lib/provider/android_signer_content_resolver_provider.dart
@@ -97,6 +97,8 @@ class AndroidSignerContentResolverProvider extends AndroidContentProvider
       }
     }
 
+    // print("appType $appType code $code authtype $authType");
+
     MatrixCursorData? data;
     if (authType == AuthType.DECRYPT_ZAP_EVENT) {
       // direct reject decrypt_zap_event query!
diff --git a/lib/provider/android_signer_mixin.dart b/lib/provider/android_signer_mixin.dart
index 7325edf..9d4d9c6 100644
--- a/lib/provider/android_signer_mixin.dart
+++ b/lib/provider/android_signer_mixin.dart
@@ -56,14 +56,14 @@ mixin AndroidSignerMixin on PermissionCheckMixin {
         var extra = intent.extra;
 
         if (intent.extra != null) {
-          var callId = extra!["id"];
+          var callId = extra![
+              "id"]; // sometime client don't send this id, don't need to check blank, just pass it return.
           var authTypeStr = extra["type"];
           var currentUser = extra["current_user"];
           var pubkey = extra["pubKey"];
           pubkey ??= extra["pubkey"];
 
-          if (StringUtil.isNotBlank(callId) &&
-              StringUtil.isNotBlank(authTypeStr) &&
+          if (StringUtil.isNotBlank(authTypeStr) &&
               StringUtil.isNotBlank(code)) {
             var authType = AuthType.GET_PUBLIC_KEY;
             if (authTypeStr == "get_public_key") {