Merge pull request #180 from KryptKode/feat/sms-delivered-status

tibbi · web-flow · commit 0b0e806d326b · 2021-08-27T12:33:26.000+02:00
Show 2 checks when sms is delivered
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -569,8 +569,8 @@ class ThreadActivity : SimpleActivity() {
                 conversationsDB.markRead(threadId)
             }
 
-            if (i == cnt - 1 && message.type == Telephony.Sms.MESSAGE_TYPE_SENT) {
-                items.add(ThreadSuccess(message.id))
+            if (i == cnt - 1 && (message.type == Telephony.Sms.MESSAGE_TYPE_SENT )) {
+                items.add(ThreadSent(message.id, delivered = message.status == Telephony.Sms.STATUS_COMPLETE))
             }
         }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
@@ -99,7 +99,7 @@ class ThreadAdapter(
             THREAD_DATE_TIME -> R.layout.item_thread_date_time
             THREAD_RECEIVED_MESSAGE -> R.layout.item_received_message
             THREAD_SENT_MESSAGE_ERROR -> R.layout.item_thread_error
-            THREAD_SENT_MESSAGE_SUCCESS -> R.layout.item_thread_success
+            THREAD_SENT_MESSAGE_SENT -> R.layout.item_thread_success
             THREAD_SENT_MESSAGE_SENDING -> R.layout.item_thread_sending
             else -> R.layout.item_sent_message
         }
@@ -113,7 +113,7 @@ class ThreadAdapter(
         holder.bindView(item, isClickable, isLongClickable) { itemView, layoutPosition ->
             when (item) {
                 is ThreadDateTime -> setupDateTime(itemView, item)
-                is ThreadSuccess -> setupThreadSuccess(itemView)
+                is ThreadSent -> setupThreadSuccess(itemView, item.delivered)
                 is ThreadError -> setupThreadError(itemView)
                 is ThreadSending -> setupThreadSending(itemView)
                 else -> setupView(itemView, item as Message)
@@ -130,7 +130,7 @@ class ThreadAdapter(
             item is ThreadDateTime -> THREAD_DATE_TIME
             (messages[position] as? Message)?.isReceivedMessage() == true -> THREAD_RECEIVED_MESSAGE
             item is ThreadError -> THREAD_SENT_MESSAGE_ERROR
-            item is ThreadSuccess -> THREAD_SENT_MESSAGE_SUCCESS
+            item is ThreadSent -> THREAD_SENT_MESSAGE_SENT
             item is ThreadSending -> THREAD_SENT_MESSAGE_SENDING
             else -> THREAD_SENT_MESSAGE
         }
@@ -350,7 +350,8 @@ class ThreadAdapter(
         }
     }
 
-    private fun setupThreadSuccess(view: View) {
+    private fun setupThreadSuccess(view: View, isDelivered: Boolean = false) {
+        view.thread_success.setImageResource(if (isDelivered) R.drawable.ic_check_double_vector else R.drawable.ic_check_vector)
         view.thread_success.applyColorFilter(textColor)
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/databases/MessagesDatabase.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/databases/MessagesDatabase.kt
@@ -17,7 +17,7 @@ import com.simplemobiletools.smsmessenger.models.Conversation
 import com.simplemobiletools.smsmessenger.models.Message
 import com.simplemobiletools.smsmessenger.models.MessageAttachment
 
-@Database(entities = [Conversation::class, Attachment::class, MessageAttachment::class, Message::class], version = 3)
+@Database(entities = [Conversation::class, Attachment::class, MessageAttachment::class, Message::class], version = 4)
 @TypeConverters(Converters::class)
 abstract class MessagesDatabase : RoomDatabase() {
 
@@ -40,6 +40,7 @@ abstract class MessagesDatabase : RoomDatabase() {
                             .fallbackToDestructiveMigration()
                             .addMigrations(MIGRATION_1_2)
                             .addMigrations(MIGRATION_2_3)
+                            .addMigrations(MIGRATION_3_4)
                             .build()
                     }
                 }
@@ -76,5 +77,13 @@ abstract class MessagesDatabase : RoomDatabase() {
                 }
             }
         }
+
+        private val MIGRATION_3_4 = object : Migration(3, 4) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL("ALTER TABLE messages ADD COLUMN status INTEGER NOT NULL DEFAULT -1")
+                }
+            }
+        }
     }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
@@ -35,9 +35,9 @@ import com.simplemobiletools.smsmessenger.interfaces.MessagesDao
 import com.simplemobiletools.smsmessenger.models.*
 import com.simplemobiletools.smsmessenger.receivers.DirectReplyReceiver
 import com.simplemobiletools.smsmessenger.receivers.MarkAsReadReceiver
-import me.leolin.shortcutbadger.ShortcutBadger
 import java.util.*
 import kotlin.collections.ArrayList
+import me.leolin.shortcutbadger.ShortcutBadger
 
 val Context.config: Config get() = Config.newInstance(applicationContext)
 
@@ -61,7 +61,8 @@ fun Context.getMessages(threadId: Long): ArrayList<Message> {
         Sms.DATE,
         Sms.READ,
         Sms.THREAD_ID,
-        Sms.SUBSCRIPTION_ID
+        Sms.SUBSCRIPTION_ID,
+        Sms.STATUS
     )
 
     val selection = "${Sms.THREAD_ID} = ?"
@@ -96,9 +97,10 @@ fun Context.getMessages(threadId: Long): ArrayList<Message> {
         val read = cursor.getIntValue(Sms.READ) == 1
         val thread = cursor.getLongValue(Sms.THREAD_ID)
         val subscriptionId = cursor.getIntValue(Sms.SUBSCRIPTION_ID)
+        val status = cursor.getIntValue(Sms.STATUS)
         val participant = SimpleContact(0, 0, senderName, photoUri, arrayListOf(senderNumber), ArrayList(), ArrayList())
         val isMMS = false
-        val message = Message(id, body, type, arrayListOf(participant), date, read, thread, isMMS, null, senderName, photoUri, subscriptionId)
+        val message = Message(id, body, type, status, arrayListOf(participant), date, read, thread, isMMS, null, senderName, photoUri, subscriptionId)
         messages.add(message)
     }
 
@@ -118,7 +120,8 @@ fun Context.getMMS(threadId: Long? = null, sortOrder: String? = null): ArrayList
         Mms.READ,
         Mms.MESSAGE_BOX,
         Mms.THREAD_ID,
-        Mms.SUBSCRIPTION_ID
+        Mms.SUBSCRIPTION_ID,
+        Mms.STATUS
     )
 
     val selection = if (threadId == null) {
@@ -143,6 +146,7 @@ fun Context.getMMS(threadId: Long? = null, sortOrder: String? = null): ArrayList
         val read = cursor.getIntValue(Mms.READ) == 1
         val threadId = cursor.getLongValue(Mms.THREAD_ID)
         val subscriptionId = cursor.getIntValue(Mms.SUBSCRIPTION_ID)
+        val status = cursor.getIntValue(Mms.STATUS)
         val participants = if (threadParticipants.containsKey(threadId)) {
             threadParticipants[threadId]!!
         } else {
@@ -164,7 +168,7 @@ fun Context.getMMS(threadId: Long? = null, sortOrder: String? = null): ArrayList
             senderPhotoUri = namePhoto.photoUri ?: ""
         }
 
-        val message = Message(mmsId, body, type, participants, date, read, threadId, isMMS, attachment, senderName, senderPhotoUri, subscriptionId)
+        val message = Message(mmsId, body, type, status, participants, date, read, threadId, isMMS, attachment, senderName, senderPhotoUri, subscriptionId)
         messages.add(message)
 
         participants.forEach {
@@ -580,10 +584,20 @@ fun Context.markThreadMessagesUnread(threadId: Long) {
     }
 }
 
-fun Context.updateMessageType(id: Long, status: Int) {
+fun Context.updateMessageType(id: Long, type: Int) {
+    val uri = Sms.CONTENT_URI
+    val contentValues = ContentValues().apply {
+        put(Sms.TYPE, type)
+    }
+    val selection = "${Sms._ID} = ?"
+    val selectionArgs = arrayOf(id.toString())
+    contentResolver.update(uri, contentValues, selection, selectionArgs)
+}
+
+fun Context.updateMessageStatus(id: Long, status: Int) {
     val uri = Sms.CONTENT_URI
     val contentValues = ContentValues().apply {
-        put(Sms.TYPE, status)
+        put(Sms.STATUS, status)
     }
     val selection = "${Sms._ID} = ?"
     val selectionArgs = arrayOf(id.toString())
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
@@ -25,7 +25,7 @@ const val THREAD_DATE_TIME = 1
 const val THREAD_RECEIVED_MESSAGE = 2
 const val THREAD_SENT_MESSAGE = 3
 const val THREAD_SENT_MESSAGE_ERROR = 4
-const val THREAD_SENT_MESSAGE_SUCCESS = 5
+const val THREAD_SENT_MESSAGE_SENT = 5
 const val THREAD_SENT_MESSAGE_SENDING = 6
 
 // lock screen visibility constants
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/MessagesDao.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/MessagesDao.kt
@@ -35,6 +35,9 @@ interface MessagesDao {
     @Query("UPDATE messages SET type = :type WHERE id = :id")
     fun updateType(id: Long, type: Int): Int
 
+    @Query("UPDATE messages SET status = :status WHERE id = :id")
+    fun updateStatus(id: Long, status: Int): Int
+
     @Query("DELETE FROM messages WHERE id = :id")
     fun delete(id: Long)
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Message.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Message.kt
@@ -11,6 +11,7 @@ data class Message(
     @PrimaryKey val id: Long,
     @ColumnInfo(name = "body") val body: String,
     @ColumnInfo(name = "type") val type: Int,
+    @ColumnInfo(name = "status") val status: Int,
     @ColumnInfo(name = "participants") val participants: ArrayList<SimpleContact>,
     @ColumnInfo(name = "date") val date: Int,
     @ColumnInfo(name = "read") val read: Boolean,
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ThreadSent.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ThreadSent.kt
@@ -0,0 +1,5 @@
+package com.simplemobiletools.smsmessenger.models
+
+// show a check after the latest message, if it is a sent one and succeeded,
+// show a double check if it is delivered
+data class ThreadSent(val messageID: Long, val delivered: Boolean) : ThreadItem()
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ThreadSuccess.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/ThreadSuccess.kt
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt
@@ -21,6 +21,7 @@ class SmsReceiver : BroadcastReceiver() {
         var subject = ""
         var date = 0L
         var threadId = 0L
+        var status = Telephony.Sms.STATUS_NONE
         val type = Telephony.Sms.MESSAGE_TYPE_INBOX
         val read = 0
         val subscriptionId = intent.getIntExtra("subscription", -1)
@@ -29,6 +30,7 @@ class SmsReceiver : BroadcastReceiver() {
             messages.forEach {
                 address = it.originatingAddress ?: ""
                 subject = it.pseudoSubject
+                status = it.status
                 body += it.messageBody
                 date = Math.min(it.timestampMillis, System.currentTimeMillis())
                 threadId = context.getThreadId(address)
@@ -49,7 +51,7 @@ class SmsReceiver : BroadcastReceiver() {
                         val participant = SimpleContact(0, 0, address, "", arrayListOf(address), ArrayList(), ArrayList())
                         val participants = arrayListOf(participant)
                         val messageDate = (date / 1000).toInt()
-                        val message = Message(newMessageId, body, type, participants, messageDate, false, threadId, false, null, address, "", subscriptionId)
+                        val message = Message(newMessageId, body, type, status, participants, messageDate, false, threadId, false, null, address, "", subscriptionId)
                         context.messagesDB.insertOrUpdate(message)
                         refreshMessages()
                     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusDeliveredReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusDeliveredReceiver.kt
@@ -9,7 +9,7 @@ import android.provider.Telephony
 import com.klinker.android.send_message.DeliveredReceiver
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.smsmessenger.extensions.messagesDB
-import com.simplemobiletools.smsmessenger.extensions.updateMessageType
+import com.simplemobiletools.smsmessenger.extensions.updateMessageStatus
 import com.simplemobiletools.smsmessenger.helpers.refreshMessages
 
 class SmsStatusDeliveredReceiver : DeliveredReceiver() {
@@ -19,13 +19,13 @@ class SmsStatusDeliveredReceiver : DeliveredReceiver() {
             val uri = Uri.parse(intent.getStringExtra("message_uri"))
             val messageId = uri?.lastPathSegment?.toLong() ?: 0L
             ensureBackgroundThread {
-                val type = Telephony.Sms.MESSAGE_TYPE_SENT
-                context.updateMessageType(messageId, type)
-                val updated = context.messagesDB.updateType(messageId, type)
+                val status = Telephony.Sms.STATUS_COMPLETE
+                context.updateMessageStatus(messageId, status)
+                val updated = context.messagesDB.updateStatus(messageId, status)
                 if (updated == 0) {
                     Handler(Looper.getMainLooper()).postDelayed({
                         ensureBackgroundThread {
-                            context.messagesDB.updateType(messageId, type)
+                            context.messagesDB.updateStatus(messageId, status)
                         }
                     }, 2000)
                 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt
@@ -39,7 +39,7 @@ class SmsStatusSentReceiver : SentReceiver() {
                     showSendingFailedNotification(context, messageId)
                     Telephony.Sms.MESSAGE_TYPE_FAILED
                 } else {
-                    Telephony.Sms.MESSAGE_TYPE_OUTBOX
+                    Telephony.Sms.MESSAGE_TYPE_SENT
                 }
 
                 context.updateMessageType(messageId, type)
diff --git a/app/src/main/res/drawable/ic_check_double_vector.xml b/app/src/main/res/drawable/ic_check_double_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z" />
+</vector>

Original file line number	Diff line number	Diff line change
`@@ -569,8 +569,8 @@ class ThreadActivity : SimpleActivity() {`
`569`	`569`	`conversationsDB.markRead(threadId)`
`570`	`570`	`}`
`571`	`571`
`572`		`- if (i == cnt - 1 && message.type == Telephony.Sms.MESSAGE_TYPE_SENT) {`
`573`		`- items.add(ThreadSuccess(message.id))`
	`572`	`+ if (i == cnt - 1 && (message.type == Telephony.Sms.MESSAGE_TYPE_SENT )) {`
	`573`	`+ items.add(ThreadSent(message.id, delivered = message.status == Telephony.Sms.STATUS_COMPLETE))`
`574`	`574`	`}`
`575`	`575`	`}`
`576`	`576`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import com.simplemobiletools.smsmessenger.models.Conversation`
`17`	`17`	`import com.simplemobiletools.smsmessenger.models.Message`
`18`	`18`	`import com.simplemobiletools.smsmessenger.models.MessageAttachment`
`19`	`19`
`20`		`-@Database(entities = [Conversation::class, Attachment::class, MessageAttachment::class, Message::class], version = 3)`
	`20`	`+@Database(entities = [Conversation::class, Attachment::class, MessageAttachment::class, Message::class], version = 4)`
`21`	`21`	`@TypeConverters(Converters::class)`
`22`	`22`	`abstract class MessagesDatabase : RoomDatabase() {`
`23`	`23`
`@@ -40,6 +40,7 @@ abstract class MessagesDatabase : RoomDatabase() {`
`40`	`40`	`.fallbackToDestructiveMigration()`
`41`	`41`	`.addMigrations(MIGRATION_1_2)`
`42`	`42`	`.addMigrations(MIGRATION_2_3)`
	`43`	`+ .addMigrations(MIGRATION_3_4)`
`43`	`44`	`.build()`
`44`	`45`	`}`
`45`	`46`	`}`
`@@ -76,5 +77,13 @@ abstract class MessagesDatabase : RoomDatabase() {`
`76`	`77`	`}`
`77`	`78`	`}`
`78`	`79`	`}`
	`80`	`+`
	`81`	`+ private val MIGRATION_3_4 = object : Migration(3, 4) {`
	`82`	`+ override fun migrate(database: SupportSQLiteDatabase) {`
	`83`	`+ database.apply {`
	`84`	`+ execSQL("ALTER TABLE messages ADD COLUMN status INTEGER NOT NULL DEFAULT -1")`
	`85`	`+ }`
	`86`	`+ }`
	`87`	`+ }`
`79`	`88`	`}`
`80`	`89`	`}`