fenix
/
Simple-SMS-Messenger
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mark messages as read in the local db too

This commit is contained in:
tibbi 2020-05-30 20:29:37 +02:00
parent 0db8b202c7
commit 8dd3fc561f
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
View File

@ -421,6 +421,7 @@ class ThreadActivity : SimpleActivity() {
if (!it.read) { if (!it.read) {
hadUnreadItems = true hadUnreadItems = true
markMessageRead(it.id, it.isMMS) markMessageRead(it.id, it.isMMS)
conversationsDB.markRead(threadId.toLong())
} }
} }

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

@ -468,8 +468,6 @@ fun Context.insertNewSMS(address: String, subject: String, body: String, date: L
} }
fun Context.deleteConversation(threadId: Int) { fun Context.deleteConversation(threadId: Int) {
conversationsDB.deleteThreadId(threadId.toLong())
var uri = Sms.CONTENT_URI var uri = Sms.CONTENT_URI
val selection = "${Sms.THREAD_ID} = ?" val selection = "${Sms.THREAD_ID} = ?"
val selectionArgs = arrayOf(threadId.toString()) val selectionArgs = arrayOf(threadId.toString())
@ -477,6 +475,8 @@ fun Context.deleteConversation(threadId: Int) {
uri = Mms.CONTENT_URI uri = Mms.CONTENT_URI
contentResolver.delete(uri, selection, selectionArgs) contentResolver.delete(uri, selection, selectionArgs)
conversationsDB.deleteThreadId(threadId.toLong())
} }
fun Context.deleteMessage(id: Int, isMMS: Boolean) { fun Context.deleteMessage(id: Int, isMMS: Boolean) {
@ -550,6 +550,7 @@ fun Context.showReceivedMessageNotification(address: String, body: String, threa
action = MARK_AS_READ action = MARK_AS_READ
putExtra(MESSAGE_ID, messageId) putExtra(MESSAGE_ID, messageId)
putExtra(MESSAGE_IS_MMS, isMMS) putExtra(MESSAGE_IS_MMS, isMMS)
putExtra(THREAD_ID, threadID)
} }
val markAsReadPendingIntent = PendingIntent.getBroadcast(this, 0, markAsReadIntent, PendingIntent.FLAG_CANCEL_CURRENT) val markAsReadPendingIntent = PendingIntent.getBroadcast(this, 0, markAsReadIntent, PendingIntent.FLAG_CANCEL_CURRENT)

3
app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/ConversationsDao.kt
View File

@ -14,6 +14,9 @@ interface ConversationsDao {
@Query("SELECT * FROM conversations") @Query("SELECT * FROM conversations")
fun getAll(): List<Conversation> fun getAll(): List<Conversation>
@Query("UPDATE conversations SET read = 1 WHERE thread_id = :threadId")
fun markRead(threadId: Long)
@Query("DELETE FROM conversations WHERE id = :id") @Query("DELETE FROM conversations WHERE id = :id")
fun delete(id: Long) fun delete(id: Long)

12
app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MarkAsReadReceiver.kt
View File

@ -4,19 +4,27 @@ import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import com.simplemobiletools.commons.extensions.notificationManager import com.simplemobiletools.commons.extensions.notificationManager
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.smsmessenger.extensions.conversationsDB
import com.simplemobiletools.smsmessenger.extensions.markMessageRead import com.simplemobiletools.smsmessenger.extensions.markMessageRead
import com.simplemobiletools.smsmessenger.helpers.MARK_AS_READ import com.simplemobiletools.smsmessenger.helpers.MARK_AS_READ
import com.simplemobiletools.smsmessenger.helpers.MESSAGE_ID import com.simplemobiletools.smsmessenger.helpers.MESSAGE_ID
import com.simplemobiletools.smsmessenger.helpers.MESSAGE_IS_MMS import com.simplemobiletools.smsmessenger.helpers.MESSAGE_IS_MMS
import com.simplemobiletools.smsmessenger.helpers.THREAD_ID
class MarkAsReadReceiver : BroadcastReceiver() { class MarkAsReadReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
when (intent.action) { when (intent.action) {
MARK_AS_READ -> { MARK_AS_READ -> {
val messageId = intent.getIntExtra(MESSAGE_ID, 0) val messageId = intent.getIntExtra(MESSAGE_ID, 0)
val isMMS = intent.getBooleanExtra(MESSAGE_IS_MMS, false)
context.markMessageRead(messageId, isMMS)
context.notificationManager.cancel(messageId) context.notificationManager.cancel(messageId)
ensureBackgroundThread {
val isMMS = intent.getBooleanExtra(MESSAGE_IS_MMS, false)
context.markMessageRead(messageId, isMMS)
val threadId = intent.getIntExtra(THREAD_ID, 0)
context.conversationsDB.markRead(threadId.toLong())
}
} }
} }
} }