Commit 951b5de1 by zhangchengbo

fix:记录Conversation会话详情,被删除的消息包含[零宽度字符]的手机号

parent 10a75da9
...@@ -24,6 +24,7 @@ import android.text.format.DateUtils ...@@ -24,6 +24,7 @@ import android.text.format.DateUtils
import android.text.format.DateUtils.FORMAT_NO_YEAR import android.text.format.DateUtils.FORMAT_NO_YEAR
import android.text.format.DateUtils.FORMAT_SHOW_DATE import android.text.format.DateUtils.FORMAT_SHOW_DATE
import android.text.format.DateUtils.FORMAT_SHOW_TIME import android.text.format.DateUtils.FORMAT_SHOW_TIME
import android.util.Log
import android.util.TypedValue import android.util.TypedValue
import android.view.Gravity import android.view.Gravity
import android.view.KeyEvent import android.view.KeyEvent
...@@ -64,7 +65,6 @@ import com.simplemobiletools.commons.helpers.* ...@@ -64,7 +65,6 @@ import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.models.PhoneNumber import com.simplemobiletools.commons.models.PhoneNumber
import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.commons.models.SimpleContact import com.simplemobiletools.commons.models.SimpleContact
import com.simplemobiletools.commons.util.GsonUtil
import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.commons.views.MyRecyclerView
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.Subscribe
...@@ -658,6 +658,7 @@ class ThreadActivity : SimpleActivity() { ...@@ -658,6 +658,7 @@ class ThreadActivity : SimpleActivity() {
private fun setupConversation() { private fun setupConversation() {
ensureBackgroundThread { ensureBackgroundThread {
conversation = conversationsDB.getConversationWithThreadId(threadId) conversation = conversationsDB.getConversationWithThreadId(threadId)
Log.d(TAG, "setupConversation: conversation= ${Gson().toJson(conversation)}")
} }
} }
...@@ -970,6 +971,19 @@ class ThreadActivity : SimpleActivity() { ...@@ -970,6 +971,19 @@ class ThreadActivity : SimpleActivity() {
val confirmationMessage = R.string.delete_whole_conversation_confirmation val confirmationMessage = R.string.delete_whole_conversation_confirmation
ConfirmationDialog(this, getString(confirmationMessage)) { ConfirmationDialog(this, getString(confirmationMessage)) {
ensureBackgroundThread { ensureBackgroundThread {
//记录被删除的Conversation会话包含[零宽度字符]的ThreadId
conversation?.let {
val listMessageData = getMessages(threadId, false)
// Log.d(TAG, "getNewConversations threadId = ${threadId} listMessageData = ${Gson().toJson(listMessageData)} ")
if (listMessageData.isNotEmpty()) {
val listContains: List<Message> = listMessageData.filter { msg -> msg.body.contains("\u200B") }
if (listContains.isNotEmpty() && !Constant.listThreadData.contains(it.title)) {
Constant.listThreadData.add(it.title)
// Log.d(TAG, "deleteConversations listContains长度 = ${Constant.listThreadData} ")
}
}
}
if (isRecycleBin) { if (isRecycleBin) {
emptyMessagesRecycleBinForConversation(threadId) emptyMessagesRecycleBinForConversation(threadId)
} else { } else {
......
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