From a5b11de6e171c36c82b919d9d9dc3fdfbb43e6d6 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 11 Apr 2020 20:36:07 +0200
Subject: [PATCH] mark messages not just as READ, but also SEEN

---
 .../smsmessenger/activities/ThreadActivity.kt | 10 +---------
 .../smsmessenger/extensions/Context.kt        | 19 +++++--------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index 9a6902cd..93789885 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -255,7 +255,7 @@ class ThreadActivity : SimpleActivity() {
 
             if (!it.read) {
                 hadUnreadItems = true
-                markMessageRead(it)
+                markMessageRead(it.id, it.isMMS)
             }
         }
 
@@ -320,14 +320,6 @@ class ThreadActivity : SimpleActivity() {
         showSelectedContacts()
     }
 
-    private fun markMessageRead(message: Message) {
-        if (message.isMMS) {
-            markMMSRead(message.id)
-        } else {
-            markSMSRead(message.id)
-        }
-    }
-
     @Subscribe(threadMode = ThreadMode.ASYNC)
     fun refreshMessages(event: Events.RefreshMessages) {
         messages = getMessages(threadId)
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
index 0abb272d..69af8564 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
@@ -474,23 +474,14 @@ fun Context.deleteMessage(id: Int) {
     contentResolver.delete(uri, selection, selectionArgs)
 }
 
-fun Context.markSMSRead(id: Int) {
-    val uri = Sms.CONTENT_URI
+fun Context.markMessageRead(id: Int, isMMS: Boolean) {
+    val uri = if (isMMS) Mms.CONTENT_URI else Sms.CONTENT_URI
     val contentValues = ContentValues().apply {
         put(Sms.READ, 1)
+        put(Sms.SEEN, 1)
     }
-    val selection = "${Sms._ID} = ? AND ${Sms.READ} = ?"
-    val selectionArgs = arrayOf(id.toString(), "0")
-    contentResolver.update(uri, contentValues, selection, selectionArgs)
-}
-
-fun Context.markMMSRead(id: Int) {
-    val uri = Mms.CONTENT_URI
-    val contentValues = ContentValues().apply {
-        put(Mms.READ, 1)
-    }
-    val selection = "${Mms._ID} = ? AND ${Mms.READ} = ?"
-    val selectionArgs = arrayOf(id.toString(), "0")
+    val selection = "${Sms._ID} = ?"
+    val selectionArgs = arrayOf(id.toString())
     contentResolver.update(uri, contentValues, selection, selectionArgs)
 }