fix:解决首页搜索框,输入内容后手机号未脱敏

app/src/main/kotlin/com/secspace/sms/activities/MainActivity.kt

@@ -27,6 +27,7 @@ import com.secspace.sms.helpers.THREAD_ID
 import com.secspace.sms.helpers.THREAD_TITLE
 import com.secspace.sms.models.*
 import com.secspace.sms.receivers.SmsSendObserver
+import com.secspace.sms.util.PhoneFromUtil
 import com.secspace.sms.util.PhoneUtils
 import com.secspace.sms.util.SmsCountUtil
 import com.simplemobiletools.commons.dialogs.PermissionRequiredDialog
@@ -472,8 +473,8 @@ class MainActivity : SimpleActivity() {
             //根据最新的短信threadId 获取所有短信列表 取最新一条记录
             val messages: java.util.ArrayList<Message> = getMessages(firstConversation.threadId, true)
 //            Log.e(TAG, " MainActivity getMessages()  执行查询会话 messages 数据库  =:${GsonUtil.parseListToJson(messages)}  ")
-//            Log.d(TAG, " MainActivity getMessages()  lastMsg 数据库  =:${GsonUtil.parseBeanToJson(messages.last())}  ")
-            val lastMsg = messages.last()
+
+            val lastMsg: Message = messages.last()
             firstConversation.snippet = lastMsg.body
             firstConversation.date = lastMsg.date
 
@@ -481,11 +482,24 @@ class MainActivity : SimpleActivity() {
 //            Log.d(TAG, "sendNormalMessage:  该对话是否有包含零宽字符 = ${listContains.isNotEmpty()}")
             if (listContains.isNotEmpty()) {
                 firstConversation.isSFNumber = true
-//                Log.d(TAG, "sendNormalMessage: last body = ${GsonUtil.parseBeanToJson(conversationsDB.getNonArchived().last())}")
+                if (lastMsg.senderPhoneNumber.isNotEmpty() && PhoneFromUtil.isNumeric(lastMsg.senderPhoneNumber))
+                    PhoneUtils.phoneNumberFormat(lastMsg.senderPhoneNumber) {
+                        firstConversation.phoneNumber = it
+                        firstConversation.title = it
+                    }
+
+                val listMsg = messagesDB.getThreadMessages(lastMsg.threadId)
+                listMsg.forEach { itemBean ->
+                    PhoneUtils.phoneNumberFormat(lastMsg.senderName) {
+                        itemBean.senderName = it
+                    }
+                    messagesDB.insertOrUpdate(itemBean)
+                }
+//                Log.d(TAG, " MainActivity getMessages()  lastMsg 数据库 threadId = ${lastMsg.threadId}  =:${GsonUtil.parseListToJson(listMsg)}  ")
             }
 //            Log.d(TAG, " MainActivity getMessages()  firstConversation 数据库  =:${GsonUtil.parseBeanToJson(firstConversation)}  ")
             conversationsDB.insertOrUpdate(firstConversation)
-
+//            Log.d(TAG, " MainActivity getMessages()  lastMsg 数据库  =:${GsonUtil.parseBeanToJson(lastMsg)}  ")
         }
     }
 
@@ -623,8 +637,10 @@ class MainActivity : SimpleActivity() {
         if (text.length >= 2) {
             ensureBackgroundThread {
                 val searchQuery = "%$text%"
-                val messages = messagesDB.getMessagesWithText(searchQuery)
-                val conversations = conversationsDB.getConversationsWithText(searchQuery)
+                val messages: List<Message> = messagesDB.getMessagesWithText(searchQuery)
+//                Log.d(TAG, "setupOptionsMenu  搜索消息 messages = ${GsonUtil.parseListToJson(messages)} ")
+                val conversations: List<Conversation> = conversationsDB.getConversationsWithText(searchQuery)
+//                Log.d(TAG, "setupOptionsMenu  搜索消息 conversations = ${GsonUtil.parseListToJson(conversations)} ")
                 if (text == lastSearchedText) {
                     showSearchResults(messages, conversations, text)
                 }
@@ -642,6 +658,7 @@ class MainActivity : SimpleActivity() {
             val searchResult = SearchResult(-1, conversation.title, conversation.phoneNumber, date, conversation.threadId, conversation.photoUri)
             searchResults.add(searchResult)
         }
+//        Log.d(TAG, "setupOptionsMenu  搜索消息 conversations  searchResults = ${GsonUtil.parseListToJson(searchResults)} ")
 
         messages.sortedByDescending { it.id }.forEach { message ->
             var recipient = message.senderName