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

lets add a Participants field into Message

Browse Source
This commit is contained in:
tibbi
2020-04-08 20:36:59 +02:00
parent 424b77577c
commit 8b37aab610
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
View File

@@ -140,8 +140,8 @@ class MainActivity : SimpleActivity() {
MessagesAdapter(this, messages, messages_list, messages_fastscroller) { MessagesAdapter(this, messages, messages_list, messages_fastscroller) {
Intent(this, ThreadActivity::class.java).apply { Intent(this, ThreadActivity::class.java).apply {
putExtra(THREAD_ID, (it as Message).thread) putExtra(THREAD_ID, (it as Message).thread)
putExtra(THREAD_NAME, it.senderName) putExtra(THREAD_NAME, it.participants.first().name)
putExtra(THREAD_NUMBER, it.senderNumber) putExtra(THREAD_NUMBER, it.participants.first().phoneNumber)
startActivity(this) startActivity(this)
} }
}.apply { }.apply {

2
app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/MessagesAdapter.kt
View File

@@ -108,7 +108,7 @@ class MessagesAdapter(
view.apply { view.apply {
message_frame.isSelected = selectedKeys.contains(message.id) message_frame.isSelected = selectedKeys.contains(message.id)
message_address.text = message.senderName message_address.text = message.participants.first().name
message_body_short.text = message.body message_body_short.text = message.body
message_date.text = message.date.formatDateOrTime(context, true) message_date.text = message.date.formatDateOrTime(context, true)

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

@@ -63,7 +63,8 @@ fun Context.getMessages(threadId: Int? = null): ArrayList<Message> {
val date = (cursor.getLongValue(Sms.DATE) / 1000).toInt() val date = (cursor.getLongValue(Sms.DATE) / 1000).toInt()
val read = cursor.getIntValue(Sms.READ) == 1 val read = cursor.getIntValue(Sms.READ) == 1
val thread = cursor.getIntValue(Sms.THREAD_ID) val thread = cursor.getIntValue(Sms.THREAD_ID)
val message = Message(id, body, type, senderName, senderNumber, date, read, thread) val participant = Contact(0, senderName, "", senderNumber, false)
val message = Message(id, body, type, arrayListOf(participant), date, read, thread)
messages.add(message) messages.add(message)
} }
@@ -73,7 +74,7 @@ fun Context.getMessages(threadId: Int? = null): ArrayList<Message> {
messages = messages.distinctBy { it.thread }.toMutableList() as ArrayList<Message> messages = messages.distinctBy { it.thread }.toMutableList() as ArrayList<Message>
} }
messages = messages.filter { !isNumberBlocked(it.senderNumber) }.toMutableList() as ArrayList<Message> messages = messages.filter { !isNumberBlocked(it.participants.first().phoneNumber) }.toMutableList() as ArrayList<Message>
return messages return messages
} }
@@ -109,7 +110,8 @@ fun Context.getMMS(threadId: Int? = null): ArrayList<Message> {
val senderName = getThreadRecipients(thread) val senderName = getThreadRecipients(thread)
val senderNumber = senderName val senderNumber = senderName
val mms = getMmsContent(id) val mms = getMmsContent(id)
val message = Message(id, mms?.text ?: "", type, senderName, senderNumber, date, read, thread) val participant = Contact(0, senderName, "", senderNumber, false)
val message = Message(id, mms?.text ?: "", type, arrayListOf(participant), date, read, thread)
messages.add(message) messages.add(message)
} }
return messages return messages

3
app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Message.kt
View File

@@ -3,8 +3,7 @@ package com.simplemobiletools.smsmessenger.models
import android.provider.Telephony import android.provider.Telephony
data class Message( data class Message(
val id: Int, val body: String, val type: Int, val senderName: String, val senderNumber: String, val date: Int, val read: Boolean, val id: Int, val body: String, val type: Int, val participants: ArrayList<Contact>, val date: Int, val read: Boolean, val thread: Int
val thread: Int
) : ThreadItem() { ) : ThreadItem() {
fun isReceivedMessage() = type == Telephony.Sms.MESSAGE_TYPE_INBOX fun isReceivedMessage() = type == Telephony.Sms.MESSAGE_TYPE_INBOX
} }