Handle sending scheduled messages

app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/ArrayList.kt

@@ -1,6 +0,0 @@
-package com.simplemobiletools.smsmessenger.extensions
-
-import android.text.TextUtils
-import com.simplemobiletools.commons.models.SimpleContact
-
-fun ArrayList<SimpleContact>.getThreadTitle() = TextUtils.join(", ", map { it.name }.toTypedArray())

app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Collections.kt

@@ -30,3 +30,5 @@ fun Map<String, Any>.toContentValues(): ContentValues {
 
     return contentValues
 }
+
+fun <T> Collection<T>.toArrayList() = ArrayList(this)

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

@@ -57,7 +57,7 @@ val Context.messageAttachmentsDB: MessageAttachmentsDao get() = getMessagesDB().
 
 val Context.messagesDB: MessagesDao get() = getMessagesDB().MessagesDao()
 
-fun Context.getMessages(threadId: Long, getImageResolutions: Boolean, dateFrom: Int = -1): ArrayList<Message> {
+fun Context.getMessages(threadId: Long, getImageResolutions: Boolean, dateFrom: Int = -1, includeScheduledMessages: Boolean = true): ArrayList<Message> {
     val uri = Sms.CONTENT_URI
     val projection = arrayOf(
         Sms._ID,
@@ -116,8 +116,17 @@ fun Context.getMessages(threadId: Long, getImageResolutions: Boolean, dateFrom:
     }
 
     messages.addAll(getMMS(threadId, getImageResolutions, sortOrder))
-    messages = messages.filter { it.participants.isNotEmpty() }
-        .sortedWith(compareBy<Message> { it.date }.thenBy { it.id }).toMutableList() as ArrayList<Message>
+
+    if (includeScheduledMessages) {
+        val scheduledMessages = messagesDB.getScheduledThreadMessages(threadId)
+        messages.addAll(scheduledMessages)
+    }
+
+    messages = messages
+        .filter { it.participants.isNotEmpty() }
+        .filterNot { it.isScheduled && it.millis() < System.currentTimeMillis() }
+        .sortedWith(compareBy<Message> { it.date }.thenBy { it.id })
+        .toMutableList() as ArrayList<Message>
 
     return messages
 }

app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Date.kt

@@ -14,6 +14,6 @@ fun DateTime.humanize(context: Context, now: DateTime = DateTime.now(), pattern:
     return if (yearOfCentury().get() > now.yearOfCentury().get()) {
         toString(pattern)
     } else {
-        DateUtils.getRelativeDateTimeString(context, millis, DateUtils.MINUTE_IN_MILLIS, DateUtils.DAY_IN_MILLIS, 0).toString()
+        DateUtils.getRelativeDateTimeString(context, millis, DateUtils.SECOND_IN_MILLIS, DateUtils.DAY_IN_MILLIS, 0).toString()
     }
 }

app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/SimpleContact.kt

@@ -0,0 +1,8 @@
+package com.simplemobiletools.smsmessenger.extensions
+
+import android.text.TextUtils
+import com.simplemobiletools.commons.models.SimpleContact
+
+fun ArrayList<SimpleContact>.getThreadTitle(): String = TextUtils.join(", ", map { it.name }.toTypedArray()).orEmpty()
+
+fun ArrayList<SimpleContact>.getAddresses() = flatMap { it.phoneNumbers }.map { it.normalizedNumber }