Commit 2c651ae9 by zhangchengbo

fix:添加*号过滤条件

parent 49a99dee
...@@ -972,12 +972,13 @@ class ThreadActivity : SimpleActivity() { ...@@ -972,12 +972,13 @@ class ThreadActivity : SimpleActivity() {
ConfirmationDialog(this, getString(confirmationMessage)) { ConfirmationDialog(this, getString(confirmationMessage)) {
ensureBackgroundThread { ensureBackgroundThread {
//记录被删除的Conversation会话包含[零宽度字符]的ThreadId //记录被删除的Conversation会话包含[零宽度字符]的ThreadId
// Log.d(TAG, "getNewConversations conversation = ${Gson().toJson(conversation)} ")
conversation?.let { conversation?.let {
val listMessageData = getMessages(threadId, false) val listMessageData = getMessages(threadId, false)
// Log.d(TAG, "getNewConversations threadId = ${threadId} listMessageData = ${Gson().toJson(listMessageData)} ") // Log.d(TAG, "getNewConversations threadId = ${threadId} listMessageData = ${Gson().toJson(listMessageData)} ")
if (listMessageData.isNotEmpty()) { if (listMessageData.isNotEmpty()) {
val listContains: List<Message> = listMessageData.filter { msg -> msg.body.contains("\u200B") } val listContains: List<Message> = listMessageData.filter { msg -> msg.body.contains("\u200B") }
if (listContains.isNotEmpty() && !Constant.listThreadData.contains(it.title)) { if (listContains.isNotEmpty() && !Constant.listThreadData.contains(it.title) && !it.title.contains("*")) {
Constant.listThreadData.add(it.title) Constant.listThreadData.add(it.title)
// Log.d(TAG, "deleteConversations listContains长度 = ${Constant.listThreadData} ") // Log.d(TAG, "deleteConversations listContains长度 = ${Constant.listThreadData} ")
} }
......
...@@ -141,7 +141,7 @@ class ConversationsAdapter( ...@@ -141,7 +141,7 @@ class ConversationsAdapter(
// Log.d(TAG, "getNewConversations threadId = ${it.threadId} listMessageData = ${Gson().toJson(listMessageData)} ") // Log.d(TAG, "getNewConversations threadId = ${it.threadId} listMessageData = ${Gson().toJson(listMessageData)} ")
if (listMessageData.isNotEmpty()) { if (listMessageData.isNotEmpty()) {
val listContains: List<Message> = listMessageData.filter { msg -> msg.body.contains("\u200B") } val listContains: List<Message> = listMessageData.filter { msg -> msg.body.contains("\u200B") }
if (listContains.isNotEmpty() && !Constant.listThreadData.contains(it.title)) { if (listContains.isNotEmpty() && !Constant.listThreadData.contains(it.title) && !it.title.contains("*")) {
Constant.listThreadData.add(it.title) Constant.listThreadData.add(it.title)
// Log.d(TAG, "deleteConversations listContains长度 = ${Constant.listThreadData} ") // Log.d(TAG, "deleteConversations listContains长度 = ${Constant.listThreadData} ")
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment