diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index 5b0da597..9e291652 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -254,9 +254,8 @@ class QkRealmMigration @Inject constructor( } if (version == 12L) { - realm.schema.create("EmojiReaction") + val emojiReactionTable = realm.schema.create("EmojiReaction") .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED) - .addField("targetMessageId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) .addField("reactionMessageId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) .addField("senderAddress", String::class.java, FieldAttribute.REQUIRED) .addField("emoji", String::class.java, FieldAttribute.REQUIRED) @@ -266,6 +265,7 @@ class QkRealmMigration @Inject constructor( realm.schema.get("Message") ?.addField("isEmojiReaction", Boolean::class.java, FieldAttribute.REQUIRED) + ?.addRealmListField("emojiReactions", emojiReactionTable) ?.transform { msg -> msg.setBoolean("isEmojiReaction", false) } diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt index a1660d01..89ebe5de 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -78,7 +78,7 @@ object EmojiReactionUtils { val result = parser(match) if (result == null) continue - Timber.d("Reaction found: $result") + Timber.d("Reaction found with ${result.emoji}") return result } @@ -93,7 +93,7 @@ object EmojiReactionUtils { val result = parser(match) if (result == null) continue - Timber.d("Reaction found: $result") + Timber.d("Removal found with ${result.emoji}") return result } @@ -136,11 +136,9 @@ object EmojiReactionUtils { return } - val existingReaction = realm.where(EmojiReaction::class.java) - .equalTo("targetMessageId", targetMessage.id) - .equalTo("senderAddress", reactionMessage.address) - .equalTo("emoji", reaction.emoji) - .findFirst() + val existingReaction = targetMessage.emojiReactions.find { candidate -> + candidate.senderAddress == reactionMessage.address && candidate.emoji == reaction.emoji + } if (existingReaction != null) { existingReaction.deleteFromRealm() @@ -168,18 +166,19 @@ object EmojiReactionUtils { val reaction = EmojiReaction().apply { id = keyManager.newId() reactionMessageId = reactionMessage.id - targetMessageId = targetMessage?.id ?: 0 senderAddress = reactionMessage.address emoji = parsedReaction.emoji originalMessageText = parsedReaction.originalMessage threadId = reactionMessage.threadId } - realm.insertOrUpdate(reaction) + reactionMessage.isEmojiReaction = true realm.insertOrUpdate(reactionMessage) if (targetMessage != null) { + targetMessage.emojiReactions.add(reaction) + Timber.i("Saved emoji reaction: ${reaction.emoji} to message ${targetMessage.id}") } else { Timber.w("Saved emoji reaction without target message: ${reaction.emoji}") diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt index 10451625..437a2809 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt @@ -25,9 +25,6 @@ import io.realm.annotations.PrimaryKey open class EmojiReaction : RealmObject() { @PrimaryKey var id: Long = 0 - /** The message this is a reaction to */ - @Index var targetMessageId: Long = 0 - /** The reaction message ID itself */ @Index var reactionMessageId: Long = 0 diff --git a/domain/src/main/java/com/moez/QKSMS/model/Message.kt b/domain/src/main/java/com/moez/QKSMS/model/Message.kt index 5c7d5fc8..90f70ab8 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt @@ -26,6 +26,7 @@ import android.provider.Telephony.Sms import dev.octoshrimpy.quik.extensions.joinTo import io.realm.RealmList import io.realm.RealmObject +import io.realm.RealmResults import io.realm.annotations.Index import io.realm.annotations.PrimaryKey @@ -74,7 +75,10 @@ open class Message : RealmObject() { var subject: String = "" var textContentType: String = "" var parts: RealmList = RealmList() + /** is this message a reaction to another message? */ var isEmojiReaction: Boolean = false + /** emoji reactions to this message */ + val emojiReactions: RealmList = RealmList() fun getUri(): Uri { val baseUri = if (isMms()) Mms.CONTENT_URI else Sms.CONTENT_URI diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt index 855a8130..b5d2c550 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt @@ -26,9 +26,9 @@ object BubbleUtils { const val TIMESTAMP_THRESHOLD = 10 - // TODO: update to consider emoji reactions fun canGroup(message: Message, other: Message?): Boolean { if (other == null) return false + if (message.emojiReactions.isNotEmpty() || other.emojiReactions.isNotEmpty()) return false val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date)) return message.compareSender(other) && diff < TIMESTAMP_THRESHOLD } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index 2858b574..cb2dfb0b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -64,7 +64,6 @@ import dev.octoshrimpy.quik.feature.compose.BubbleUtils.getBubble import dev.octoshrimpy.quik.feature.compose.part.PartsAdapter import dev.octoshrimpy.quik.feature.extensions.isEmojiOnly import dev.octoshrimpy.quik.model.Conversation -import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.util.PhoneNumberUtils @@ -72,7 +71,6 @@ import dev.octoshrimpy.quik.util.Preferences import io.reactivex.disposables.Disposable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import io.realm.Realm import io.realm.RealmResults import kotlinx.android.synthetic.main.message_list_item_in.* import kotlinx.android.synthetic.main.message_list_item_in.body @@ -399,7 +397,7 @@ class MessagesAdapter @Inject constructor( private fun bindEmojiReactions(holder: QkViewHolder, message: Message) { holder.reactions?.let { reactionsContainer -> - val reactions = getReactionsForMessage(message.id) + val reactions = message.emojiReactions val hasReactions = reactions.isNotEmpty() if (hasReactions) { @@ -438,15 +436,6 @@ class MessagesAdapter @Inject constructor( } } - private fun getReactionsForMessage(messageId: Long): List { - return Realm.getDefaultInstance().use { realm -> - realm.where(EmojiReaction::class.java) - .equalTo("targetMessageId", messageId) - .findAll() - .let { realm.copyFromRealm(it) } - } - } - private fun bindStatus( holder: QkViewHolder, bodyTextTruncated: Boolean,