fenix/Simple-SMS-Messenger
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git synced 2025-06-05 21:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into add-sms-draft

Browse Source
This commit is contained in:
Agnieszka C
2021-09-08 15:12:05 +02:00
committed by GitHub
parent 14b7526ab3 345a611b0e
commit 02a8633ffd
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
View File

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

11
app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
View File

@@ -813,6 +813,17 @@ fun Context.deleteSmsDraft(threadId: Long) {
contentResolver.delete(uri, null, null) contentResolver.delete(uri, null, null)
} }
} }
}
}
fun Context.updateLastConversationMessage(threadId: Long) {
val uri = Threads.CONTENT_URI
val selection = "${Threads._ID} = ?"
val selectionArgs = arrayOf(threadId.toString())
try {
contentResolver.delete(uri, selection, selectionArgs)
val newConversation = getConversations(threadId)[0]
conversationsDB.insertOrUpdate(newConversation)
} catch (e: Exception) { } catch (e: Exception) {
} }
} }