From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 22 Jun 2021 15:50:17 +0000 (+0800)
Subject: fixed contact list issues.
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=9b0504cf357ee0905d38dcdd9e70ae0b30c5e7f7;p=protocol_srv.git

fixed contact list issues.
---

diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java
index 2aed74fa..921c4f35 100644
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -1340,7 +1340,7 @@ public class protocol_fzd {
         //TODO:保存到fzd的联系人里，类型为SOS
         if (data != null && data.length() > 0) {
             String[] list = data.split(CMD_SPLIT);
-            ArrayList<Contact> contactArray = new ArrayList<Contact>();
+            ArrayList<Contact> contactArray = new ArrayList<>();
             ContentValues contentValues = new ContentValues();
             contentValues.put(FZDDatabaseHelper.fType, FZDDatabaseHelper.MemberType.SOS);
             if (list.length == 1) {
@@ -1349,7 +1349,7 @@ public class protocol_fzd {
                     ICLogger.i("find SOS1 number " + list[0]);
                     contentValues.put(FZDDatabaseHelper.fUserName, "sos1");
                     contentValues.put(FZDDatabaseHelper.fPhoneNum, list[0]);
-                    runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
+                    //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
                 }
             } else if (list.length == 2) {
                 if (regexUtil.isMobileNumber(list[0]) || regexUtil.isPhoneNumber(list[0])) {
@@ -1357,14 +1357,14 @@ public class protocol_fzd {
                     ICLogger.i("find SOS1 number " + list[0]);
                     contentValues.put(FZDDatabaseHelper.fUserName, "sos1");
                     contentValues.put(FZDDatabaseHelper.fPhoneNum, list[0]);
-                    runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
+                    //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
                 }
                 if (regexUtil.isMobileNumber(list[1]) || regexUtil.isPhoneNumber(list[1])) {
                     contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", list[1]));
                     ICLogger.i("find SOS2 number " + list[1]);
                     contentValues.put(FZDDatabaseHelper.fUserName, "sos2");
                     contentValues.put(FZDDatabaseHelper.fPhoneNum, list[1]);
-                    runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
+                    //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
                 }
             } else if (list.length == 3) {
                 if (regexUtil.isMobileNumber(list[0]) || regexUtil.isPhoneNumber(list[0])) {
@@ -1372,21 +1372,21 @@ public class protocol_fzd {
                     ICLogger.i("find SOS1 number " + list[0]);
                     contentValues.put(FZDDatabaseHelper.fUserName, "sos1");
                     contentValues.put(FZDDatabaseHelper.fPhoneNum, list[0]);
-                    runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
+                    //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
                 }
                 if (regexUtil.isMobileNumber(list[1]) || regexUtil.isPhoneNumber(list[1])) {
                     contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", list[1]));
                     ICLogger.i("find SOS2 number " + list[1]);
                     contentValues.put(FZDDatabaseHelper.fUserName, "sos2");
                     contentValues.put(FZDDatabaseHelper.fPhoneNum, list[1]);
-                    runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
+                    //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
                 }
                 if (regexUtil.isMobileNumber(list[2]) || regexUtil.isPhoneNumber(list[2])) {
                     contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos3", list[2]));
                     ICLogger.i("find SOS3 number " + list[2]);
                     contentValues.put(FZDDatabaseHelper.fUserName, "sos3");
                     contentValues.put(FZDDatabaseHelper.fPhoneNum, list[2]);
-                    runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
+                    //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
                 }
             }
             runtime.getDbHelper().saveContacts(contactArray, false, false, false, false, false, true);
@@ -1455,7 +1455,6 @@ public class protocol_fzd {
                 //保存到新的数据库中，为了防止问题，先兼容原来的库
                 //后面所有地方都切换到新库了，才删除上面的代码
                 // TODO:需要修改白名单拦截的地方.
-                ICLogger.d("contentValues == > " + contentValues.size());
                 resolver.insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
             }
             //TODO:保存到fzd的联系人列表，类型为白名单
diff --git a/app/version_code.properties b/app/version_code.properties
index 9d20f13c..a8e3db0c 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,5 +1,5 @@
-#Tue Jun 22 22:51:18 CST 2021
+#Tue Jun 22 23:46:37 CST 2021
 >>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db
-VERSION_CODE=835
-=\=\=\=\=\=\=
+VERSION_CODE=836
 <<<<<<<=HEAD
+=\=\=\=\=\=\=