diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/RecipientColumns.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/RecipientColumns.kt new file mode 100644 index 00000000..e5d9b408 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/RecipientColumns.kt @@ -0,0 +1,11 @@ +package com.moez.QKSMS.data.sync + +import android.net.Uri + +class RecipientColumns { + + companion object { + val URI = Uri.parse("content://mms-sms/canonical-address/") + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt index a85d572a..a6e693b2 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt @@ -32,7 +32,7 @@ internal object SyncManager { .flatMap { cursor -> cursor.asFlowable() } .map { cursor -> Conversation(cursor) } .distinct { conversation -> conversation.id } - .doOnNext { conversation -> realm?.insert(conversation) } + .doOnNext { conversation -> realm?.insertOrUpdate(conversation) } .map { conversation -> conversation.id } .concatMap { threadId -> val uri = Uri.withAppendedPath(MessageColumns.URI, threadId.toString()) @@ -42,7 +42,7 @@ internal object SyncManager { } .filter { message -> message.type == "sms" || message.type == "mms" } .distinct { message -> message.id } - .doOnNext { message -> realm?.insert(message) } + .doOnNext { message -> realm?.insertOrUpdate(message) } .count() .toFlowable() .doOnNext { diff --git a/qksms/src/main/java/com/moez/QKSMS/model/Conversation.kt b/qksms/src/main/java/com/moez/QKSMS/model/Conversation.kt index 1e8d563e..8498bbef 100644 --- a/qksms/src/main/java/com/moez/QKSMS/model/Conversation.kt +++ b/qksms/src/main/java/com/moez/QKSMS/model/Conversation.kt @@ -2,6 +2,8 @@ package com.moez.QKSMS.model import android.database.Cursor import com.moez.QKSMS.data.sync.ConversationColumns +import io.reactivex.Flowable +import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey @@ -10,7 +12,7 @@ open class Conversation() : RealmObject() { @PrimaryKey var id: Long = 0 var date: Long = 0 var messageCount: Int = 0 - var recipientIds: Int = 0 + var recipients: RealmList = RealmList() var snippet: String = "" var snippetCs: String = "" var read: Int = 0 @@ -24,12 +26,16 @@ open class Conversation() : RealmObject() { id = cursor.getLong(ConversationColumns.ID) date = cursor.getLong(ConversationColumns.DATE) messageCount = cursor.getInt(ConversationColumns.MESSAGE_COUNT) - recipientIds = cursor.getInt(ConversationColumns.RECIPIENT_IDS) + + Flowable.fromIterable(cursor.getString(ConversationColumns.RECIPIENT_IDS).split(" ")) + .map { id -> id.toLong() } + .map { id -> Recipient(id) } + .blockingSubscribe { recipient -> recipients.add(recipient) } + snippet = cursor.getString(ConversationColumns.SNIPPET) ?: "" snippetCs = cursor.getString(ConversationColumns.SNIPPET_CS) ?: "" read = cursor.getInt(ConversationColumns.READ) error = cursor.getInt(ConversationColumns.ERROR) hasAttachment = cursor.getInt(ConversationColumns.HAS_ATTACHMENT) } - } diff --git a/qksms/src/main/java/com/moez/QKSMS/model/Recipient.kt b/qksms/src/main/java/com/moez/QKSMS/model/Recipient.kt new file mode 100644 index 00000000..ae7fde2e --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/model/Recipient.kt @@ -0,0 +1,17 @@ +package com.moez.QKSMS.model + +import io.realm.RealmObject +import io.realm.annotations.PrimaryKey + +open class Recipient() : RealmObject() { + + @PrimaryKey var id: Long = 0 + + /** + * For inflating the recipient using just the id + */ + constructor(id: Long) : this() { + this.id = id + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt index 5baaca37..cdc6a43e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationAdapter.kt @@ -30,7 +30,15 @@ class ConversationAdapter(context: Context, data: OrderedRealmCollection + title += recipient.id + if (index < conversation.recipients.size - 1) { + title += ", " + } + } + + viewHolder.title.text = title viewHolder.snippet.text = conversation?.snippet } } \ No newline at end of file