Merge branch 'master' into markAsRead

This commit is contained in:
Tibor Kaputa 2021-09-08 15:19:58 +02:00 committed by GitHub
commit e2a916a993
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions

View file

@ -30,8 +30,10 @@ import com.simplemobiletools.commons.views.FastScroller
import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.smsmessenger.R
import com.simplemobiletools.smsmessenger.activities.SimpleActivity
import com.simplemobiletools.smsmessenger.activities.ThreadActivity
import com.simplemobiletools.smsmessenger.dialogs.SelectTextDialog
import com.simplemobiletools.smsmessenger.extensions.deleteMessage
import com.simplemobiletools.smsmessenger.extensions.updateLastConversationMessage
import com.simplemobiletools.smsmessenger.helpers.*
import com.simplemobiletools.smsmessenger.models.*
import kotlinx.android.synthetic.main.item_attachment_image.view.*
@ -181,10 +183,12 @@ class ThreadAdapter(
val messagesToRemove = getSelectedItems()
val positions = getSelectedItemPositions()
val threadId = (messagesToRemove[0] as Message).threadId
messagesToRemove.forEach {
activity.deleteMessage((it as Message).id, it.isMMS)
}
messages.removeAll(messagesToRemove)
activity.updateLastConversationMessage(threadId)
activity.runOnUiThread {
if (messages.filter { it is Message }.isEmpty()) {