From 401b70d16aa3b32206529fdc6ffcfbe1da14a096 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 26 Aug 2025 16:17:23 -0400 Subject: [PATCH 01/33] Parse and render emoji reactions Fixes part of #152 To keep this PR simple, I've left out: - when long-pressing on the emoji in a group MMS, a popup should come up listing which contact sent each emoji - notifications (untested) - sending emoji reactions --- .../moez/QKSMS/migration/QkRealmMigration.kt | 24 +++- .../QKSMS/repository/MessageRepositoryImpl.kt | 22 +++ .../QKSMS/repository/SyncRepositoryImpl.kt | 56 ++++++++ .../com/moez/QKSMS/util/EmojiReactionUtils.kt | 134 ++++++++++++++++++ .../com/moez/QKSMS/model/EmojiReaction.kt | 52 +++++++ .../main/java/com/moez/QKSMS/model/Message.kt | 1 + .../moez/QKSMS/feature/compose/BubbleUtils.kt | 1 + .../QKSMS/feature/compose/MessagesAdapter.kt | 57 ++++++++ .../main/res/layout/message_list_item_in.xml | 41 +++++- .../main/res/layout/message_list_item_out.xml | 58 ++++++-- 10 files changed, 432 insertions(+), 14 deletions(-) create mode 100644 data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt create mode 100644 domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt 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 a29afbb4..5b0da597 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -36,7 +36,7 @@ class QkRealmMigration @Inject constructor( ) : RealmMigration { companion object { - const val SchemaVersion: Long = 12 + const val SchemaVersion: Long = 13 } @SuppressLint("ApplySharedPref") @@ -253,6 +253,28 @@ class QkRealmMigration @Inject constructor( version++ } + if (version == 12L) { + 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) + .addField("originalMessageText", String::class.java, FieldAttribute.REQUIRED) + .addField("threadId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) + .addField("patternType", String::class.java, FieldAttribute.REQUIRED) + + realm.schema.get("Message") + ?.addField("isEmojiReaction", Boolean::class.java, FieldAttribute.REQUIRED) + ?.transform { msg -> + msg.setBoolean("isEmojiReaction", false) + } + + // TODO: scan for past emoji reaction messages + + version++ + } + check(version >= newVersion) { "Migration missing from v$oldVersion to v$newVersion" } } diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index 5a85406d..bf501966 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -57,6 +57,7 @@ import dev.octoshrimpy.quik.receiver.SendSmsReceiver import dev.octoshrimpy.quik.receiver.SmsDeliveredReceiver import dev.octoshrimpy.quik.receiver.SmsSentReceiver import dev.octoshrimpy.quik.util.ImageUtils +import dev.octoshrimpy.quik.util.EmojiReactionUtils import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.Preferences import dev.octoshrimpy.quik.util.tryOrNull @@ -88,6 +89,7 @@ open class MessageRepositoryImpl @Inject constructor( Realm.getDefaultInstance() .where(Message::class.java) .equalTo("threadId", threadId) + .equalTo("isEmojiReaction", false) .let { when (query.isEmpty()) { true -> it @@ -760,6 +762,26 @@ open class MessageRepositoryImpl @Inject constructor( // Update contentId after the message has been inserted to the content provider realm.executeTransaction { managedMessage?.contentId = id } } + + managedMessage?.let { savedMessage -> + val parsedReaction = EmojiReactionUtils.parseEmojiReaction(body) + if (parsedReaction != null) { + val targetMessage = EmojiReactionUtils.findTargetMessage( + savedMessage.threadId, + parsedReaction.originalMessage, + realm + ) + realm.executeTransaction { + EmojiReactionUtils.saveEmojiReaction( + savedMessage, + parsedReaction, + targetMessage, + messageIds, + realm, + ) + } + } + } } return message diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index 00464616..2f13c09d 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -42,6 +42,7 @@ import dev.octoshrimpy.quik.model.MmsPart import dev.octoshrimpy.quik.model.PhoneNumber import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.model.SyncLog +import dev.octoshrimpy.quik.util.EmojiReactionUtils import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.tryOrNull import io.reactivex.subjects.BehaviorSubject @@ -104,6 +105,7 @@ class SyncRepositoryImpl @Inject constructor( realm.delete(Message::class.java) realm.delete(MmsPart::class.java) realm.delete(Recipient::class.java) + realm.delete(dev.octoshrimpy.quik.model.EmojiReaction::class.java) keys.reset() @@ -202,6 +204,39 @@ class SyncRepositoryImpl @Inject constructor( syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true)) + // Now that we have all the messages, we can scan for emoji reactions + val allMessages = realm.where(Message::class.java) + .beginGroup() + .beginGroup() + .equalTo("type", "sms") + .isNotEmpty("body") + .endGroup() + .or() + .beginGroup() + .equalTo("type", "mms") + .isNotEmpty("parts.text") + .endGroup() + .endGroup() + .findAll() + + allMessages.forEach { message -> + val text = message.getText(false) + val parsedReaction = EmojiReactionUtils.parseEmojiReaction(text) + if (parsedReaction != null) { + val targetMessage = EmojiReactionUtils.findTargetMessage( + message.threadId, + parsedReaction.originalMessage, + realm + ) + EmojiReactionUtils.saveEmojiReaction( + message, + parsedReaction, + targetMessage, + keys, + realm, + ) + } + } realm.insert(SyncLog()) realm.commitTransaction() @@ -259,6 +294,27 @@ class SyncRepositoryImpl @Inject constructor( conversationRepo.getOrCreateConversation(threadId) insertOrUpdate() + + val text = getText(false) + val parsedReaction = EmojiReactionUtils.parseEmojiReaction(text) + if (parsedReaction != null) { + Realm.getDefaultInstance().use { realm -> + val targetMessage = EmojiReactionUtils.findTargetMessage( + threadId, + parsedReaction.originalMessage, + realm + ) + realm.executeTransaction { + EmojiReactionUtils.saveEmojiReaction( + this, + parsedReaction, + targetMessage, + keys, + realm, + ) + } + } + } } } } diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt new file mode 100644 index 00000000..5aa7f3bb --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2025 + * + * This file is part of QUIK. + * + * QUIK is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QUIK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QUIK. If not, see . + */ +package dev.octoshrimpy.quik.util + +import dev.octoshrimpy.quik.manager.KeyManager +import dev.octoshrimpy.quik.model.EmojiReaction +import dev.octoshrimpy.quik.model.Message +import io.realm.Realm +import io.realm.Sort +import timber.log.Timber + +data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, val patternType: String) + +object EmojiReactionUtils { + + fun parseEmojiReaction(body: String): ParsedEmojiReaction? { + // Log the raw message with unicode escapes for debugging + val escapedBody = body.map { char -> + when (char.code) { + in 0x20..0x7E -> char.toString() // printable ASCII + else -> "\\u${char.code.toString(16).padStart(4, '0')}" + } + }.joinToString("") + Timber.v("Parsing body: \"$escapedBody\"") // TODO: are we okay logging SMS content? + + val iosPattern = Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") + val iosMatch = iosPattern.find(body) + if (iosMatch != null) { + val emoji = iosMatch.groupValues[1] + val originalMessage = iosMatch.groupValues[2] + + if (emoji == "with a sticker") { + Timber.d("Skipping sticker reaction: '$originalMessage'") + return null + } + + Timber.d("iOS pattern detected - emoji: '$emoji', original: '$originalMessage'") + return ParsedEmojiReaction(emoji, originalMessage, "ios") + } + + // https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 + val googleMessagesPattern = Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") + val googleMatch = googleMessagesPattern.find(body) + if (googleMatch != null) { + val emoji = googleMatch.groupValues[1] + val originalMessage = googleMatch.groupValues[2] + Timber.d("Google Messages pattern detected - emoji: '$emoji', original: '$originalMessage'") + return ParsedEmojiReaction(emoji, originalMessage, "google") + } + + return null + } + + /** + * Search for messages in the same thread with matching text content + * We'll search recent messages first (within reasonable time window) + */ + fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { + val messages = realm.where(Message::class.java) + .equalTo("threadId", threadId) + .sort("date", Sort.DESCENDING) + .limit(50) // TODO: should we keep this limit? + .findAll() + + val exactMatch = messages.find { message -> + message.getText(false).trim() == originalMessageText.trim() + } + if (exactMatch != null) { + Timber.d("Found exact match for reaction target: message ID ${exactMatch.id}") + return exactMatch + } + + // Try partial match (in case of truncation) + val partialMatch = messages.find { message -> + val text = message.getText(false).trim() + text.isNotEmpty() && ( + text.contains(originalMessageText.trim(), ignoreCase = true) || + originalMessageText.trim().contains(text, ignoreCase = true) + ) + } + if (partialMatch != null) { + Timber.d("Found partial match for reaction target: message ID ${partialMatch.id}") + return partialMatch + } + + Timber.w("No target message found for reaction text: '$originalMessageText'") + return null + } + + fun saveEmojiReaction( + reactionMessage: Message, + parsedReaction: ParsedEmojiReaction, + targetMessage: Message?, + keyManager: KeyManager, + realm: Realm, + ) { + 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 + patternType = parsedReaction.patternType + } + + realm.insertOrUpdate(reaction) + reactionMessage.isEmojiReaction = true + realm.insertOrUpdate(reactionMessage) + + if (targetMessage != null) { + Timber.i("Saved emoji reaction: ${reaction.emoji} from ${reaction.senderAddress} to message ${targetMessage.id}") + } else { + Timber.w("Saved emoji reaction without target message: ${reaction.emoji} from ${reaction.senderAddress}") + } + } +} \ No newline at end of file diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt new file mode 100644 index 00000000..cef53759 --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2025 + * + * This file is part of QUIK. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.model + +import io.realm.RealmObject +import io.realm.annotations.Index +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 + + /** The sender's address (phone number) */ + var senderAddress: String = "" + + /** The emoji used in the reaction */ + var emoji: String = "" + + /** The original message text that was reacted to */ + var originalMessageText: String = "" + + /** Thread ID for easier querying */ + @Index var threadId: Long = 0 + + /** + * Pattern type that was matched (for debugging) + * + * for example, "ios" or "google" + */ + var patternType: String = "" +} \ No newline at end of file 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 25300368..5c7d5fc8 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt @@ -74,6 +74,7 @@ open class Message : RealmObject() { var subject: String = "" var textContentType: String = "" var parts: RealmList = RealmList() + var isEmojiReaction: Boolean = false 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 fde7149b..855a8130 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,6 +26,7 @@ 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 val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date)) 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 7aa6ea93..5e2a0125 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,6 +64,7 @@ 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 @@ -71,10 +72,13 @@ 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 +import kotlinx.android.synthetic.main.message_list_item_in.reactionText import kotlinx.android.synthetic.main.message_list_item_in.parts +import kotlinx.android.synthetic.main.message_list_item_in.reactions import kotlinx.android.synthetic.main.message_list_item_in.sim import kotlinx.android.synthetic.main.message_list_item_in.simIndex import kotlinx.android.synthetic.main.message_list_item_in.status @@ -389,6 +393,59 @@ class MessagesAdapter @Inject constructor( contextMenuValue = message.id clicks.subscribe(partClicks) // part clicks gets passed back to compose view model } + + bindEmojiReactions(holder, message) + } + + private fun bindEmojiReactions(holder: QkViewHolder, message: Message) { + holder.reactions?.let { reactionsContainer -> + val reactions = getReactionsForMessage(message.id) + val hasReactions = reactions.isNotEmpty() + + if (hasReactions) { + val reactionCounts = reactions.groupBy { it.emoji } + .mapValues { it.value.size } + .toList() + .sortedByDescending { it.second } // Sort by count, most reactions first + + // For now, show just the first (most popular) reaction + val topReaction = reactionCounts.first() + val reactionText = if (topReaction.second == 1) { + topReaction.first + } else { + "${topReaction.first} ${topReaction.second}" + } + + holder.reactionText?.text = reactionText + reactionsContainer.setVisible(true) + makeRoomForEmojis(holder) + } else { + reactionsContainer.setVisible(false) + } + } + } + + private fun makeRoomForEmojis(holder: QkViewHolder) { + val paddingBottom = 21.dpToPx(context) + + // Adjust the container padding + (holder.reactions?.parent as? ViewGroup)?.let { parent -> + parent.setPadding( + parent.paddingLeft, + parent.paddingTop, + parent.paddingRight, + paddingBottom + ) + } + } + + 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( diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index dc58afd8..79d9288f 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -89,16 +89,19 @@ app:layout_constraintBottom_toBottomOf="@id/body" app:layout_constraintStart_toStartOf="parent" /> - + android:paddingBottom="20dp" + android:clipToPadding="false"> - + + + + + + + + diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index d3c79871..6d30a91f 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -92,7 +92,8 @@ + android:layout_height="wrap_content" + android:clipToPadding="false"> - + android:paddingStart="18dp" + android:paddingBottom="21dp" + android:clipToPadding="false"> + + + + + + + + + + Date: Tue, 26 Aug 2025 16:38:44 -0400 Subject: [PATCH 02/33] cleanup --- .../main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index 2f13c09d..a9a99a9e 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -37,6 +37,7 @@ import dev.octoshrimpy.quik.mapper.CursorToRecipient import dev.octoshrimpy.quik.model.Contact import dev.octoshrimpy.quik.model.ContactGroup import dev.octoshrimpy.quik.model.Conversation +import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.model.MmsPart import dev.octoshrimpy.quik.model.PhoneNumber @@ -105,7 +106,7 @@ class SyncRepositoryImpl @Inject constructor( realm.delete(Message::class.java) realm.delete(MmsPart::class.java) realm.delete(Recipient::class.java) - realm.delete(dev.octoshrimpy.quik.model.EmojiReaction::class.java) + realm.delete(EmojiReaction::class.java) keys.reset() From a2568f165918622609c1965f3fad727b9b147794 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 26 Aug 2025 22:32:22 -0400 Subject: [PATCH 03/33] simplify target matching --- .../com/moez/QKSMS/util/EmojiReactionUtils.kt | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) 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 5aa7f3bb..728ed297 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -78,25 +78,12 @@ object EmojiReactionUtils { .limit(50) // TODO: should we keep this limit? .findAll() - val exactMatch = messages.find { message -> + val match = messages.find { message -> message.getText(false).trim() == originalMessageText.trim() } - if (exactMatch != null) { - Timber.d("Found exact match for reaction target: message ID ${exactMatch.id}") - return exactMatch - } - - // Try partial match (in case of truncation) - val partialMatch = messages.find { message -> - val text = message.getText(false).trim() - text.isNotEmpty() && ( - text.contains(originalMessageText.trim(), ignoreCase = true) || - originalMessageText.trim().contains(text, ignoreCase = true) - ) - } - if (partialMatch != null) { - Timber.d("Found partial match for reaction target: message ID ${partialMatch.id}") - return partialMatch + if (match != null) { + Timber.d("Found match for reaction target: message ID ${match.id}") + return match } Timber.w("No target message found for reaction text: '$originalMessageText'") From 0c111b2ad270b71fe3129ec1fe1a6174ccdb2ecb Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 27 Aug 2025 17:47:40 -0400 Subject: [PATCH 04/33] fix default msg padding --- presentation/src/main/res/layout/message_list_item_in.xml | 1 - presentation/src/main/res/layout/message_list_item_out.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index 79d9288f..52da388a 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -93,7 +93,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:paddingBottom="20dp" android:clipToPadding="false"> Date: Wed, 27 Aug 2025 17:47:45 -0400 Subject: [PATCH 05/33] handle iOS tapbacks --- .../com/moez/QKSMS/util/EmojiReactionUtils.kt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 728ed297..7ed1ec78 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -29,6 +29,15 @@ data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, v object EmojiReactionUtils { + val iosTapbacks = mapOf( + Regex("^Loved \u201C(.+?)\u201D$") to "❤️", + Regex("^Liked \u201C(.+?)\u201D$") to "👍", + Regex("^Disliked \u201C(.+?)\u201D$") to "👎", + Regex("^Laughed at \u201C(.+?)\u201D$") to "😂", + Regex("^Emphasized \u201C(.+?)\u201D$") to "‼️", + Regex("^Questioned \u201C(.+?)\u201D$") to "❓", + ) + fun parseEmojiReaction(body: String): ParsedEmojiReaction? { // Log the raw message with unicode escapes for debugging val escapedBody = body.map { char -> @@ -54,6 +63,15 @@ object EmojiReactionUtils { return ParsedEmojiReaction(emoji, originalMessage, "ios") } + for ((pattern, emoji) in iosTapbacks) { + val iosTapbackMatch = pattern.find(body) + if (iosTapbackMatch != null) { + val originalMessage = iosTapbackMatch.groupValues[1] + Timber.d("iOS tapback detected - emoji: '$emoji', original: '$originalMessage'") + return ParsedEmojiReaction(emoji, originalMessage, "ios") + } + } + // https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 val googleMessagesPattern = Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") val googleMatch = googleMessagesPattern.find(body) From 465a6ee739d243bfac0759c18b7ad08b1973bf8d Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 27 Aug 2025 18:45:08 -0400 Subject: [PATCH 06/33] handle removals --- .../QKSMS/repository/SyncRepositoryImpl.kt | 1 + .../com/moez/QKSMS/util/EmojiReactionUtils.kt | 132 +++++++++++++----- .../com/moez/QKSMS/model/EmojiReaction.kt | 7 - 3 files changed, 96 insertions(+), 44 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index a9a99a9e..52d1f51c 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -218,6 +218,7 @@ class SyncRepositoryImpl @Inject constructor( .isNotEmpty("parts.text") .endGroup() .endGroup() + .sort("date", Sort.ASCENDING) // parse oldest to newest to handle reactions & removals properly .findAll() allMessages.forEach { message -> 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 7ed1ec78..812e14e6 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -25,17 +25,46 @@ import io.realm.Realm import io.realm.Sort import timber.log.Timber -data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, val patternType: String) +data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, val isRemoval: Boolean = false) object EmojiReactionUtils { - val iosTapbacks = mapOf( - Regex("^Loved \u201C(.+?)\u201D$") to "❤️", - Regex("^Liked \u201C(.+?)\u201D$") to "👍", - Regex("^Disliked \u201C(.+?)\u201D$") to "👎", - Regex("^Laughed at \u201C(.+?)\u201D$") to "😂", - Regex("^Emphasized \u201C(.+?)\u201D$") to "‼️", - Regex("^Questioned \u201C(.+?)\u201D$") to "❓", + private fun tapback(emoji: String, isRemoval: Boolean = false): (MatchResult) -> ParsedEmojiReaction { + return { match -> + ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval) + } + } + + val reactionPatterns: Map ParsedEmojiReaction?> = mapOf( + // https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 + Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], ) + }, + Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") to { match -> + if (match.groupValues[1] == "with a sticker") + null + else + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + }, + Regex("^Loved \u201C(.+?)\u201D$") to tapback("❤️"), + Regex("^Liked \u201C(.+?)\u201D$") to tapback("👍"), + Regex("^Disliked \u201C(.+?)\u201D$") to tapback("👎"), + Regex("^Laughed at \u201C(.+?)\u201D$") to tapback("😂"), + Regex("^Emphasized \u201C(.+?)\u201D$") to tapback("‼️"), + Regex("^Questioned \u201C(.+?)\u201D$") to tapback("❓"), + ) + + val removalPatterns: Map ParsedEmojiReaction?> = mapOf( + // TODO: google messages removal + Regex("^Removed a heart from \u201C(.+?)\u201D$") to tapback("❤️", true), + Regex("^Removed a like from \u201C(.+?)\u201D$") to tapback("👍", true), + Regex("^Removed a dislike from \u201C(.+?)\u201D$") to tapback("👎", true), + Regex("^Removed a laugh from \u201C(.+?)\u201D$") to tapback("😂", true), + Regex("^Removed an exclamation from \u201C(.+?)\u201D$") to tapback("‼️", true), + Regex("^Removed a question mark from \u201C(.+?)\u201D$") to tapback("❓", true), + Regex("^Removed (.+?) from \u201C(.+?)\u201D$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + }, ) fun parseEmojiReaction(body: String): ParsedEmojiReaction? { @@ -46,40 +75,35 @@ object EmojiReactionUtils { else -> "\\u${char.code.toString(16).padStart(4, '0')}" } }.joinToString("") - Timber.v("Parsing body: \"$escapedBody\"") // TODO: are we okay logging SMS content? + Timber.d("Parsing body: \"$escapedBody\"") // TODO: are we okay logging SMS content? - val iosPattern = Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") - val iosMatch = iosPattern.find(body) - if (iosMatch != null) { - val emoji = iosMatch.groupValues[1] - val originalMessage = iosMatch.groupValues[2] + val removal = parseRemoval(body) + if (removal != null) return removal - if (emoji == "with a sticker") { - Timber.d("Skipping sticker reaction: '$originalMessage'") - return null - } + for ((pattern, parser) in reactionPatterns) { + val match = pattern.find(body) + if (match == null) continue; - Timber.d("iOS pattern detected - emoji: '$emoji', original: '$originalMessage'") - return ParsedEmojiReaction(emoji, originalMessage, "ios") + val result = parser(match) + if (result == null) continue + + Timber.d("Reaction found: $result") + return result } - for ((pattern, emoji) in iosTapbacks) { - val iosTapbackMatch = pattern.find(body) - if (iosTapbackMatch != null) { - val originalMessage = iosTapbackMatch.groupValues[1] - Timber.d("iOS tapback detected - emoji: '$emoji', original: '$originalMessage'") - return ParsedEmojiReaction(emoji, originalMessage, "ios") - } - } + return null + } - // https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 - val googleMessagesPattern = Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") - val googleMatch = googleMessagesPattern.find(body) - if (googleMatch != null) { - val emoji = googleMatch.groupValues[1] - val originalMessage = googleMatch.groupValues[2] - Timber.d("Google Messages pattern detected - emoji: '$emoji', original: '$originalMessage'") - return ParsedEmojiReaction(emoji, originalMessage, "google") + private fun parseRemoval(body: String): ParsedEmojiReaction? { + for ((pattern, parser) in removalPatterns) { + val match = pattern.find(body) + if (match == null) continue; + + val result = parser(match) + if (result == null) continue + + Timber.d("Reaction found: $result") + return result } return null @@ -108,6 +132,36 @@ object EmojiReactionUtils { return null } + fun removeEmojiReaction( + reactionMessage: Message, + parsedReaction: ParsedEmojiReaction, + targetMessage: Message?, + realm: Realm, + ) { + if (targetMessage == null) { + Timber.w("Cannot remove emoji reaction: no target message found for '${parsedReaction.originalMessage}'") + reactionMessage.isEmojiReaction = true + realm.insertOrUpdate(reactionMessage) + return + } + + val existingReaction = realm.where(EmojiReaction::class.java) + .equalTo("targetMessageId", targetMessage.id) + .equalTo("senderAddress", reactionMessage.address) + .equalTo("emoji", parsedReaction.emoji) + .findFirst() + + if (existingReaction != null) { + existingReaction.deleteFromRealm() + Timber.d("Removed emoji reaction: ${parsedReaction.emoji} from ${reactionMessage.address} to message ${targetMessage.id}") + } else { + Timber.w("No existing emoji reaction found to remove: ${parsedReaction.emoji} from ${reactionMessage.address} to message ${targetMessage.id}") + } + + reactionMessage.isEmojiReaction = true + realm.insertOrUpdate(reactionMessage) + } + fun saveEmojiReaction( reactionMessage: Message, parsedReaction: ParsedEmojiReaction, @@ -115,6 +169,11 @@ object EmojiReactionUtils { keyManager: KeyManager, realm: Realm, ) { + if (parsedReaction.isRemoval) { + removeEmojiReaction(reactionMessage, parsedReaction, targetMessage, realm) + return + } + val reaction = EmojiReaction().apply { id = keyManager.newId() reactionMessageId = reactionMessage.id @@ -123,7 +182,6 @@ object EmojiReactionUtils { emoji = parsedReaction.emoji originalMessageText = parsedReaction.originalMessage threadId = reactionMessage.threadId - patternType = parsedReaction.patternType } realm.insertOrUpdate(reaction) 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 cef53759..04d8ca0f 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt @@ -42,11 +42,4 @@ open class EmojiReaction : RealmObject() { /** Thread ID for easier querying */ @Index var threadId: Long = 0 - - /** - * Pattern type that was matched (for debugging) - * - * for example, "ios" or "google" - */ - var patternType: String = "" } \ No newline at end of file From 2b093612881f82e72f77bd08d823f3521e1846b6 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 27 Aug 2025 21:31:43 -0400 Subject: [PATCH 07/33] remove pii logs --- .../com/moez/QKSMS/util/EmojiReactionUtils.kt | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) 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 812e14e6..a1660d01 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -68,15 +68,6 @@ object EmojiReactionUtils { ) fun parseEmojiReaction(body: String): ParsedEmojiReaction? { - // Log the raw message with unicode escapes for debugging - val escapedBody = body.map { char -> - when (char.code) { - in 0x20..0x7E -> char.toString() // printable ASCII - else -> "\\u${char.code.toString(16).padStart(4, '0')}" - } - }.joinToString("") - Timber.d("Parsing body: \"$escapedBody\"") // TODO: are we okay logging SMS content? - val removal = parseRemoval(body) if (removal != null) return removal @@ -132,14 +123,14 @@ object EmojiReactionUtils { return null } - fun removeEmojiReaction( + private fun removeEmojiReaction( reactionMessage: Message, - parsedReaction: ParsedEmojiReaction, + reaction: ParsedEmojiReaction, targetMessage: Message?, realm: Realm, ) { if (targetMessage == null) { - Timber.w("Cannot remove emoji reaction: no target message found for '${parsedReaction.originalMessage}'") + Timber.w("Cannot remove emoji reaction '${reaction.emoji}': no target message found") reactionMessage.isEmojiReaction = true realm.insertOrUpdate(reactionMessage) return @@ -148,14 +139,14 @@ object EmojiReactionUtils { val existingReaction = realm.where(EmojiReaction::class.java) .equalTo("targetMessageId", targetMessage.id) .equalTo("senderAddress", reactionMessage.address) - .equalTo("emoji", parsedReaction.emoji) + .equalTo("emoji", reaction.emoji) .findFirst() if (existingReaction != null) { existingReaction.deleteFromRealm() - Timber.d("Removed emoji reaction: ${parsedReaction.emoji} from ${reactionMessage.address} to message ${targetMessage.id}") + Timber.d("Removed emoji reaction: ${reaction.emoji} to message ${targetMessage.id}") } else { - Timber.w("No existing emoji reaction found to remove: ${parsedReaction.emoji} from ${reactionMessage.address} to message ${targetMessage.id}") + Timber.w("No existing emoji reaction found to remove: ${reaction.emoji} to message ${targetMessage.id}") } reactionMessage.isEmojiReaction = true @@ -189,9 +180,9 @@ object EmojiReactionUtils { realm.insertOrUpdate(reactionMessage) if (targetMessage != null) { - Timber.i("Saved emoji reaction: ${reaction.emoji} from ${reaction.senderAddress} to message ${targetMessage.id}") + Timber.i("Saved emoji reaction: ${reaction.emoji} to message ${targetMessage.id}") } else { - Timber.w("Saved emoji reaction without target message: ${reaction.emoji} from ${reaction.senderAddress}") + Timber.w("Saved emoji reaction without target message: ${reaction.emoji}") } } -} \ No newline at end of file +} From dfe83a3b48088c6fb57f7a407575f008ffe52b87 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 27 Aug 2025 21:37:12 -0400 Subject: [PATCH 08/33] newlines --- domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 04d8ca0f..10451625 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt @@ -42,4 +42,4 @@ open class EmojiReaction : RealmObject() { /** Thread ID for easier querying */ @Index var threadId: Long = 0 -} \ No newline at end of file +} From 9b2ae330b96b76ebce127738f90f30e600428432 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 27 Aug 2025 21:37:16 -0400 Subject: [PATCH 09/33] cleanup --- .../main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt | 1 - presentation/src/main/res/layout/message_list_item_out.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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 5e2a0125..2858b574 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 @@ -428,7 +428,6 @@ class MessagesAdapter @Inject constructor( private fun makeRoomForEmojis(holder: QkViewHolder) { val paddingBottom = 21.dpToPx(context) - // Adjust the container padding (holder.reactions?.parent as? ViewGroup)?.let { parent -> parent.setPadding( parent.paddingLeft, diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index a6402f83..6ae28a27 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -186,7 +186,7 @@ android:paddingTop="4dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:text="👍 1" + android:text="👍" android:textColor="?android:attr/textColorPrimary" android:textSize="16sp" /> From 8a90923d7bbba859e332ab084301b46a79c3e441 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 27 Aug 2025 21:59:50 -0400 Subject: [PATCH 10/33] Fix clipping a bit --- presentation/src/main/res/layout/message_list_item_out.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index 6ae28a27..6c327730 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -150,7 +150,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="18dp" - android:clipToPadding="false"> + android:clipToPadding="false" + android:clipChildren="false"> Date: Wed, 27 Aug 2025 23:15:23 -0400 Subject: [PATCH 11/33] Fix message grouping --- .../moez/QKSMS/migration/QkRealmMigration.kt | 4 ++-- .../com/moez/QKSMS/util/EmojiReactionUtils.kt | 17 ++++++++--------- .../java/com/moez/QKSMS/model/EmojiReaction.kt | 3 --- .../main/java/com/moez/QKSMS/model/Message.kt | 4 ++++ .../moez/QKSMS/feature/compose/BubbleUtils.kt | 2 +- .../QKSMS/feature/compose/MessagesAdapter.kt | 13 +------------ 6 files changed, 16 insertions(+), 27 deletions(-) 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, From 46ec29546f57f3fafc215af26ef58d5d6dd566d1 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 17:30:28 -0400 Subject: [PATCH 12/33] Parse google messages emoji removal --- .../com/moez/QKSMS/migration/QkRealmMigration.kt | 1 - .../java/com/moez/QKSMS/util/EmojiReactionUtils.kt | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) 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 9e291652..442eeae3 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -261,7 +261,6 @@ class QkRealmMigration @Inject constructor( .addField("emoji", String::class.java, FieldAttribute.REQUIRED) .addField("originalMessageText", String::class.java, FieldAttribute.REQUIRED) .addField("threadId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) - .addField("patternType", String::class.java, FieldAttribute.REQUIRED) realm.schema.get("Message") ?.addField("isEmojiReaction", Boolean::class.java, FieldAttribute.REQUIRED) 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 89ebe5de..251a69bd 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -36,16 +36,18 @@ object EmojiReactionUtils { } val reactionPatterns: Map ParsedEmojiReaction?> = mapOf( - // https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 + // Google Messages - https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], ) + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) }, + // iOS Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") to { match -> if (match.groupValues[1] == "with a sticker") null else ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) }, + // iOS tapbacks Regex("^Loved \u201C(.+?)\u201D$") to tapback("❤️"), Regex("^Liked \u201C(.+?)\u201D$") to tapback("👍"), Regex("^Disliked \u201C(.+?)\u201D$") to tapback("👎"), @@ -55,13 +57,18 @@ object EmojiReactionUtils { ) val removalPatterns: Map ParsedEmojiReaction?> = mapOf( - // TODO: google messages removal + // Google Messages + Regex("^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + }, + // iOS tapbacks Regex("^Removed a heart from \u201C(.+?)\u201D$") to tapback("❤️", true), Regex("^Removed a like from \u201C(.+?)\u201D$") to tapback("👍", true), Regex("^Removed a dislike from \u201C(.+?)\u201D$") to tapback("👎", true), Regex("^Removed a laugh from \u201C(.+?)\u201D$") to tapback("😂", true), Regex("^Removed an exclamation from \u201C(.+?)\u201D$") to tapback("‼️", true), Regex("^Removed a question mark from \u201C(.+?)\u201D$") to tapback("❓", true), + // iOS emoji - keep this below tapbacks as this regex would otherwise also match the patterns above Regex("^Removed (.+?) from \u201C(.+?)\u201D$") to { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) }, From b4bc87a479a07e32cd3bb318aa66016c585d0fb4 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 18:07:33 -0400 Subject: [PATCH 13/33] Fix emoji clipping --- .../java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt | 2 +- presentation/src/main/res/layout/message_list_item_in.xml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 cb2dfb0b..fe8c2854 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 @@ -424,7 +424,7 @@ class MessagesAdapter @Inject constructor( } private fun makeRoomForEmojis(holder: QkViewHolder) { - val paddingBottom = 21.dpToPx(context) + val paddingBottom = 25.dpToPx(context) (holder.reactions?.parent as? ViewGroup)?.let { parent -> parent.setPadding( diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index 52da388a..0006b0dd 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -93,7 +93,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:clipToPadding="false"> + android:clipToPadding="false" + android:clipChildren="false" + android:paddingEnd="4dp" + android:paddingStart="4dp"> Date: Tue, 2 Sep 2025 18:45:52 -0400 Subject: [PATCH 14/33] move emoji reaction code to repo and impl --- .../EmojiReactionRepositoryImpl.kt} | 115 ++++++++++-------- .../QKSMS/repository/MessageRepositoryImpl.kt | 9 +- .../QKSMS/repository/SyncRepositoryImpl.kt | 18 ++- .../repository/EmojiReactionRepository.kt | 19 +++ .../com/moez/QKSMS/injection/AppModule.kt | 5 + 5 files changed, 97 insertions(+), 69 deletions(-) rename data/src/main/java/com/moez/QKSMS/{util/EmojiReactionUtils.kt => repository/EmojiReactionRepositoryImpl.kt} (90%) create mode 100644 domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt similarity index 90% rename from data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt rename to data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 251a69bd..fd2eae4a 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -16,65 +16,25 @@ * You should have received a copy of the GNU General Public License * along with QUIK. If not, see . */ -package dev.octoshrimpy.quik.util +package dev.octoshrimpy.quik.repository import dev.octoshrimpy.quik.manager.KeyManager import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message +import dev.octoshrimpy.quik.repository.EmojiReactionUtils.reactionPatterns +import dev.octoshrimpy.quik.repository.EmojiReactionUtils.removalPatterns import io.realm.Realm import io.realm.Sort import timber.log.Timber +import javax.inject.Inject +import kotlin.collections.component1 +import kotlin.collections.component2 +import kotlin.collections.iterator -data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, val isRemoval: Boolean = false) - -object EmojiReactionUtils { - - private fun tapback(emoji: String, isRemoval: Boolean = false): (MatchResult) -> ParsedEmojiReaction { - return { match -> - ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval) - } - } - - val reactionPatterns: Map ParsedEmojiReaction?> = mapOf( - // Google Messages - https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 - Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) - }, - // iOS - Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") to { match -> - if (match.groupValues[1] == "with a sticker") - null - else - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) - }, - // iOS tapbacks - Regex("^Loved \u201C(.+?)\u201D$") to tapback("❤️"), - Regex("^Liked \u201C(.+?)\u201D$") to tapback("👍"), - Regex("^Disliked \u201C(.+?)\u201D$") to tapback("👎"), - Regex("^Laughed at \u201C(.+?)\u201D$") to tapback("😂"), - Regex("^Emphasized \u201C(.+?)\u201D$") to tapback("‼️"), - Regex("^Questioned \u201C(.+?)\u201D$") to tapback("❓"), - ) - - val removalPatterns: Map ParsedEmojiReaction?> = mapOf( - // Google Messages - Regex("^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) - }, - // iOS tapbacks - Regex("^Removed a heart from \u201C(.+?)\u201D$") to tapback("❤️", true), - Regex("^Removed a like from \u201C(.+?)\u201D$") to tapback("👍", true), - Regex("^Removed a dislike from \u201C(.+?)\u201D$") to tapback("👎", true), - Regex("^Removed a laugh from \u201C(.+?)\u201D$") to tapback("😂", true), - Regex("^Removed an exclamation from \u201C(.+?)\u201D$") to tapback("‼️", true), - Regex("^Removed a question mark from \u201C(.+?)\u201D$") to tapback("❓", true), - // iOS emoji - keep this below tapbacks as this regex would otherwise also match the patterns above - Regex("^Removed (.+?) from \u201C(.+?)\u201D$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) - }, - ) - - fun parseEmojiReaction(body: String): ParsedEmojiReaction? { +class EmojiReactionRepositoryImpl @Inject constructor( + private val keyManager: KeyManager +) : EmojiReactionRepository { + override fun parseEmojiReaction(body: String): ParsedEmojiReaction? { val removal = parseRemoval(body) if (removal != null) return removal @@ -111,7 +71,7 @@ object EmojiReactionUtils { * Search for messages in the same thread with matching text content * We'll search recent messages first (within reasonable time window) */ - fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { + override fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { val messages = realm.where(Message::class.java) .equalTo("threadId", threadId) .sort("date", Sort.DESCENDING) @@ -158,11 +118,10 @@ object EmojiReactionUtils { realm.insertOrUpdate(reactionMessage) } - fun saveEmojiReaction( + override fun saveEmojiReaction( reactionMessage: Message, parsedReaction: ParsedEmojiReaction, targetMessage: Message?, - keyManager: KeyManager, realm: Realm, ) { if (parsedReaction.isRemoval) { @@ -191,4 +150,52 @@ object EmojiReactionUtils { Timber.w("Saved emoji reaction without target message: ${reaction.emoji}") } } + +} + +object EmojiReactionUtils { + private fun tapback(emoji: String, isRemoval: Boolean = false): (MatchResult) -> ParsedEmojiReaction { + return { match -> + ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval) + } + } + + val reactionPatterns: Map ParsedEmojiReaction?> = mapOf( + // Google Messages - https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 + Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + }, + // iOS + Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") to { match -> + if (match.groupValues[1] == "with a sticker") + null + else + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + }, + // iOS tapbacks + Regex("^Loved \u201C(.+?)\u201D$") to tapback("❤️"), + Regex("^Liked \u201C(.+?)\u201D$") to tapback("👍"), + Regex("^Disliked \u201C(.+?)\u201D$") to tapback("👎"), + Regex("^Laughed at \u201C(.+?)\u201D$") to tapback("😂"), + Regex("^Emphasized \u201C(.+?)\u201D$") to tapback("‼️"), + Regex("^Questioned \u201C(.+?)\u201D$") to tapback("❓"), + ) + + val removalPatterns: Map ParsedEmojiReaction?> = mapOf( + // Google Messages + Regex("^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + }, + // iOS tapbacks + Regex("^Removed a heart from \u201C(.+?)\u201D$") to tapback("❤️", true), + Regex("^Removed a like from \u201C(.+?)\u201D$") to tapback("👍", true), + Regex("^Removed a dislike from \u201C(.+?)\u201D$") to tapback("👎", true), + Regex("^Removed a laugh from \u201C(.+?)\u201D$") to tapback("😂", true), + Regex("^Removed an exclamation from \u201C(.+?)\u201D$") to tapback("‼️", true), + Regex("^Removed a question mark from \u201C(.+?)\u201D$") to tapback("❓", true), + // iOS emoji - keep this below tapbacks as this regex would otherwise also match the patterns above + Regex("^Removed (.+?) from \u201C(.+?)\u201D$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + }, + ) } diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index 49d386ee..068b579d 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -57,7 +57,6 @@ import dev.octoshrimpy.quik.receiver.SendSmsReceiver import dev.octoshrimpy.quik.receiver.SmsDeliveredReceiver import dev.octoshrimpy.quik.receiver.SmsSentReceiver import dev.octoshrimpy.quik.util.ImageUtils -import dev.octoshrimpy.quik.util.EmojiReactionUtils import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.Preferences import dev.octoshrimpy.quik.util.tryOrNull @@ -79,6 +78,7 @@ open class MessageRepositoryImpl @Inject constructor( private val phoneNumberUtils: PhoneNumberUtils, private val prefs: Preferences, private val syncRepository: SyncRepository, + private val reactions: EmojiReactionRepository, ) : MessageRepository { companion object { @@ -765,19 +765,18 @@ open class MessageRepositoryImpl @Inject constructor( } managedMessage?.let { savedMessage -> - val parsedReaction = EmojiReactionUtils.parseEmojiReaction(body) + val parsedReaction = reactions.parseEmojiReaction(body) if (parsedReaction != null) { - val targetMessage = EmojiReactionUtils.findTargetMessage( + val targetMessage = reactions.findTargetMessage( savedMessage.threadId, parsedReaction.originalMessage, realm ) realm.executeTransaction { - EmojiReactionUtils.saveEmojiReaction( + reactions.saveEmojiReaction( savedMessage, parsedReaction, targetMessage, - messageIds, realm, ) } diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index a7e8fe9f..5241c957 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -45,7 +45,6 @@ import dev.octoshrimpy.quik.model.MmsPart import dev.octoshrimpy.quik.model.PhoneNumber import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.model.SyncLog -import dev.octoshrimpy.quik.util.EmojiReactionUtils import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.tryOrNull import io.reactivex.subjects.BehaviorSubject @@ -70,7 +69,8 @@ class SyncRepositoryImpl @Inject constructor( private val cursorToContactGroupMember: CursorToContactGroupMember, private val keys: KeyManager, private val phoneNumberUtils: PhoneNumberUtils, - private val rxPrefs: RxSharedPreferences + private val rxPrefs: RxSharedPreferences, + private val reactions: EmojiReactionRepository, ) : SyncRepository { override val syncProgress: Subject = @@ -248,18 +248,17 @@ class SyncRepositoryImpl @Inject constructor( allMessages.forEach { message -> val text = message.getText(false) - val parsedReaction = EmojiReactionUtils.parseEmojiReaction(text) + val parsedReaction = reactions.parseEmojiReaction(text) if (parsedReaction != null) { - val targetMessage = EmojiReactionUtils.findTargetMessage( + val targetMessage = reactions.findTargetMessage( message.threadId, parsedReaction.originalMessage, realm ) - EmojiReactionUtils.saveEmojiReaction( + reactions.saveEmojiReaction( message, parsedReaction, targetMessage, - keys, realm, ) } @@ -326,20 +325,19 @@ class SyncRepositoryImpl @Inject constructor( insertOrUpdate() val text = getText(false) - val parsedReaction = EmojiReactionUtils.parseEmojiReaction(text) + val parsedReaction = reactions.parseEmojiReaction(text) if (parsedReaction != null) { Realm.getDefaultInstance().use { realm -> - val targetMessage = EmojiReactionUtils.findTargetMessage( + val targetMessage = reactions.findTargetMessage( threadId, parsedReaction.originalMessage, realm ) realm.executeTransaction { - EmojiReactionUtils.saveEmojiReaction( + reactions.saveEmojiReaction( this, parsedReaction, targetMessage, - keys, realm, ) } diff --git a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt new file mode 100644 index 00000000..d327863c --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt @@ -0,0 +1,19 @@ +package dev.octoshrimpy.quik.repository + +import dev.octoshrimpy.quik.model.Message +import io.realm.Realm + +data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, val isRemoval: Boolean = false) + +interface EmojiReactionRepository { + fun parseEmojiReaction(body: String): ParsedEmojiReaction? + + fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? + + fun saveEmojiReaction( + reactionMessage: Message, + parsedReaction: ParsedEmojiReaction, + targetMessage: Message?, + realm: Realm, + ) +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt index 8a1d35b2..8d52fe2f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt @@ -81,6 +81,8 @@ import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ContactRepositoryImpl import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.ConversationRepositoryImpl +import dev.octoshrimpy.quik.repository.EmojiReactionRepository +import dev.octoshrimpy.quik.repository.EmojiReactionRepositoryImpl import dev.octoshrimpy.quik.repository.MessageContentFilterRepository import dev.octoshrimpy.quik.repository.MessageContentFilterRepositoryImpl import dev.octoshrimpy.quik.repository.MessageRepository @@ -219,6 +221,9 @@ class AppModule(private var application: Application) { @Provides fun provideSyncRepository(repository: SyncRepositoryImpl): SyncRepository = repository + @Provides + fun provideEmojiReactionRepository(repository: EmojiReactionRepositoryImpl): EmojiReactionRepository = repository + // worker factory @Provides fun provideWorkerFactory(workerFactory: InjectionWorkerFactory): WorkerFactory = workerFactory From fc70fe7f58bfefa7230e77a7026cebd15e0c8cd8 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 18:49:06 -0400 Subject: [PATCH 15/33] search all messages as emoji targets and log time taken --- .../com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index fd2eae4a..8280ee8f 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -72,11 +72,14 @@ class EmojiReactionRepositoryImpl @Inject constructor( * We'll search recent messages first (within reasonable time window) */ override fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { + // log time taken + val startTime = System.currentTimeMillis() val messages = realm.where(Message::class.java) .equalTo("threadId", threadId) .sort("date", Sort.DESCENDING) - .limit(50) // TODO: should we keep this limit? .findAll() + val endTime = System.currentTimeMillis() + Timber.d("Found ${messages.size} messages as emoji targets in ${endTime - startTime}ms") val match = messages.find { message -> message.getText(false).trim() == originalMessageText.trim() From dbba9c44c9b8f86f8331ab1e4eb4c55db275b97e Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 18:53:39 -0400 Subject: [PATCH 16/33] cleanup --- domain/src/main/java/com/moez/QKSMS/model/Message.kt | 1 - .../java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 90f70ab8..5f516eeb 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt @@ -26,7 +26,6 @@ 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 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 fe8c2854..a9cc89f1 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 @@ -392,10 +392,10 @@ class MessagesAdapter @Inject constructor( clicks.subscribe(partClicks) // part clicks gets passed back to compose view model } - bindEmojiReactions(holder, message) + showEmojiReactions(holder, message) } - private fun bindEmojiReactions(holder: QkViewHolder, message: Message) { + private fun showEmojiReactions(holder: QkViewHolder, message: Message) { holder.reactions?.let { reactionsContainer -> val reactions = message.emojiReactions val hasReactions = reactions.isNotEmpty() From 50c6e08beb5f314ade39509a2f0265aa4910b9e7 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 19:41:04 -0400 Subject: [PATCH 17/33] Parse all emoji reactions on migration --- .../moez/QKSMS/migration/QkRealmMigration.kt | 9 ++-- .../repository/EmojiReactionRepositoryImpl.kt | 52 ++++++++++++++++--- .../QKSMS/repository/SyncRepositoryImpl.kt | 34 +----------- .../com/moez/QKSMS/model/EmojiSyncNeeded.kt | 7 +++ .../repository/EmojiReactionRepository.kt | 2 + .../moez/QKSMS/feature/main/MainViewModel.kt | 12 +++++ 6 files changed, 73 insertions(+), 43 deletions(-) create mode 100644 domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt 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 88b79cc9..86668d9b 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -32,7 +32,7 @@ import javax.inject.Inject class QkRealmMigration @Inject constructor( private val cursorToContact: CursorToContactImpl, - private val prefs: Preferences + private val prefs: Preferences, ) : RealmMigration { companion object { @@ -257,7 +257,7 @@ class QkRealmMigration @Inject constructor( } if (version == 13L) { - val emojiReactionTable = realm.schema.create("EmojiReaction") + val emojiReactionTable = realm.schema.create("EmojiReaction") .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED) .addField("reactionMessageId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) .addField("senderAddress", String::class.java, FieldAttribute.REQUIRED) @@ -272,7 +272,10 @@ class QkRealmMigration @Inject constructor( msg.setBoolean("isEmojiReaction", false) } - // TODO: scan for past emoji reaction messages + realm.schema.create("EmojiSyncNeeded") + .addField("createdAt", Long::class.java, FieldAttribute.REQUIRED) + + realm.createObject("EmojiSyncNeeded") version++ } diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 8280ee8f..51b834ba 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -27,9 +27,6 @@ import io.realm.Realm import io.realm.Sort import timber.log.Timber import javax.inject.Inject -import kotlin.collections.component1 -import kotlin.collections.component2 -import kotlin.collections.iterator class EmojiReactionRepositoryImpl @Inject constructor( private val keyManager: KeyManager @@ -72,7 +69,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( * We'll search recent messages first (within reasonable time window) */ override fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { - // log time taken val startTime = System.currentTimeMillis() val messages = realm.where(Message::class.java) .equalTo("threadId", threadId) @@ -102,7 +98,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( if (targetMessage == null) { Timber.w("Cannot remove emoji reaction '${reaction.emoji}': no target message found") reactionMessage.isEmojiReaction = true - realm.insertOrUpdate(reactionMessage) return } @@ -118,7 +113,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( } reactionMessage.isEmojiReaction = true - realm.insertOrUpdate(reactionMessage) } override fun saveEmojiReaction( @@ -143,7 +137,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( realm.insertOrUpdate(reaction) reactionMessage.isEmojiReaction = true - realm.insertOrUpdate(reactionMessage) if (targetMessage != null) { targetMessage.emojiReactions.add(reaction) @@ -154,6 +147,51 @@ class EmojiReactionRepositoryImpl @Inject constructor( } } + override fun deleteAndReparseAllEmojiReactions(realm: Realm) { + val startTime = System.currentTimeMillis() + + realm.delete(EmojiReaction::class.java) + realm.where(Message::class.java).findAll().map { + it.isEmojiReaction = false + } + + val allMessages = realm.where(Message::class.java) + .beginGroup() + .beginGroup() + .equalTo("type", "sms") + .isNotEmpty("body") + .endGroup() + .or() + .beginGroup() + .equalTo("type", "mms") + .isNotEmpty("parts.text") + .endGroup() + .endGroup() + .sort("date", Sort.ASCENDING) // parse oldest to newest to handle reactions & removals properly + .findAll() + + allMessages.forEach { message -> + val text = message.getText(false) + val parsedReaction = parseEmojiReaction(text) + if (parsedReaction != null) { + val targetMessage = findTargetMessage( + message.threadId, + parsedReaction.originalMessage, + realm + ) + saveEmojiReaction( + message, + parsedReaction, + targetMessage, + realm, + ) + } + } + + val endTime = System.currentTimeMillis() + Timber.d("Deleted and reparsed all emoji reactions in ${endTime - startTime}ms") + } + } object EmojiReactionUtils { diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index 5241c957..78ca1636 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -231,38 +231,7 @@ class SyncRepositoryImpl @Inject constructor( syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true)) // Now that we have all the messages, we can scan for emoji reactions - val allMessages = realm.where(Message::class.java) - .beginGroup() - .beginGroup() - .equalTo("type", "sms") - .isNotEmpty("body") - .endGroup() - .or() - .beginGroup() - .equalTo("type", "mms") - .isNotEmpty("parts.text") - .endGroup() - .endGroup() - .sort("date", Sort.ASCENDING) // parse oldest to newest to handle reactions & removals properly - .findAll() - - allMessages.forEach { message -> - val text = message.getText(false) - val parsedReaction = reactions.parseEmojiReaction(text) - if (parsedReaction != null) { - val targetMessage = reactions.findTargetMessage( - message.threadId, - parsedReaction.originalMessage, - realm - ) - reactions.saveEmojiReaction( - message, - parsedReaction, - targetMessage, - realm, - ) - } - } + reactions.deleteAndReparseAllEmojiReactions(realm) realm.insert(SyncLog()) }, { @@ -436,7 +405,6 @@ class SyncRepositoryImpl @Inject constructor( realm.delete(Message::class.java) realm.delete(MmsPart::class.java) realm.delete(Recipient::class.java) - realm.delete(EmojiReaction::class.java) } } diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt new file mode 100644 index 00000000..8515f1dc --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt @@ -0,0 +1,7 @@ +package dev.octoshrimpy.quik.model + +import io.realm.RealmObject + +open class EmojiSyncNeeded : RealmObject() { + var createdAt: Long = System.currentTimeMillis() +} \ No newline at end of file diff --git a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt index d327863c..dde4061f 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt @@ -16,4 +16,6 @@ interface EmojiReactionRepository { targetMessage: Message?, realm: Realm, ) + + fun deleteAndReparseAllEmojiReactions(realm: Realm) } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 36a4d96a..cdfe7194 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -42,8 +42,10 @@ import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.ChangelogManager import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.manager.RatingManager +import dev.octoshrimpy.quik.model.EmojiSyncNeeded import dev.octoshrimpy.quik.model.SyncLog import dev.octoshrimpy.quik.repository.ConversationRepository +import dev.octoshrimpy.quik.repository.EmojiReactionRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.util.Preferences @@ -79,6 +81,7 @@ class MainViewModel @Inject constructor( private val permissionManager: PermissionManager, private val prefs: Preferences, private val ratingManager: RatingManager, + private val reactions: EmojiReactionRepository, private val syncContacts: SyncContacts, private val syncMessages: SyncMessages ) : QkViewModel( @@ -121,6 +124,15 @@ class MainViewModel @Inject constructor( syncMessages.execute(Unit) } + // This is only used when we update to a version that newly supports emoji reactions + Realm.getDefaultInstance().executeTransactionAsync { realm -> + val emojiSyncNeeded = realm.where(EmojiSyncNeeded::class.java).findFirst() + if (emojiSyncNeeded != null) { + reactions.deleteAndReparseAllEmojiReactions(realm) + emojiSyncNeeded.deleteFromRealm() + } + } + // Sync contacts when we detect a change if (permissionManager.hasContacts()) { disposables += contactAddedListener.listen() From d3eaa4fb2e200e7ff937b9319bcc71c232d02f65 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 22:54:00 -0400 Subject: [PATCH 18/33] cleanup --- .../moez/QKSMS/migration/QkRealmMigration.kt | 2 +- .../repository/EmojiReactionRepositoryImpl.kt | 2 +- .../com/moez/QKSMS/model/EmojiSyncNeeded.kt | 18 ++++++++++++++++++ .../repository/EmojiReactionRepository.kt | 18 ++++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) 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 86668d9b..7f221a65 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -32,7 +32,7 @@ import javax.inject.Inject class QkRealmMigration @Inject constructor( private val cursorToContact: CursorToContactImpl, - private val prefs: Preferences, + private val prefs: Preferences ) : RealmMigration { companion object { diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 51b834ba..2b077e18 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -66,7 +66,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( /** * Search for messages in the same thread with matching text content - * We'll search recent messages first (within reasonable time window) + * We'll search recent messages first */ override fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { val startTime = System.currentTimeMillis() diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt index 8515f1dc..cb9013f6 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2025 + * + * This file is part of QUIK. + * + * QUIK is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QUIK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QUIK. If not, see . + */ package dev.octoshrimpy.quik.model import io.realm.RealmObject diff --git a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt index dde4061f..15f1fdd0 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2025 + * + * This file is part of QUIK. + * + * QUIK is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QUIK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QUIK. If not, see . + */ package dev.octoshrimpy.quik.repository import dev.octoshrimpy.quik.model.Message From f6019e1d8026e0f72bfa7a1ae3dab0e4859891a1 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 3 Sep 2025 22:21:04 -0400 Subject: [PATCH 19/33] Localize emoji patterns --- data/build.gradle | 1 + data/src/main/assets/emojis/en.json | 25 ++++ .../QKSMS/repository/EmojiPatternStrings.kt | 31 ++++ .../repository/EmojiReactionRepositoryImpl.kt | 141 +++++++++++------- presentation/build.gradle | 7 + 5 files changed, 152 insertions(+), 53 deletions(-) create mode 100644 data/src/main/assets/emojis/en.json create mode 100644 data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt diff --git a/data/build.gradle b/data/build.gradle index 7077cecd..1819170d 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -81,6 +81,7 @@ dependencies { implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.jakewharton.timber:timber:$timber_version" implementation "com.squareup.moshi:moshi:$moshi_version" + kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" implementation "com.squareup.okhttp3:okhttp:$okhttp3_version" implementation 'io.michaelrocks:libphonenumber-android:8.13.47' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" diff --git a/data/src/main/assets/emojis/en.json b/data/src/main/assets/emojis/en.json new file mode 100644 index 00000000..402dbdb1 --- /dev/null +++ b/data/src/main/assets/emojis/en.json @@ -0,0 +1,25 @@ +{ + "emoji_reaction_google_messages_added": "^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$", + "emoji_reaction_google_messages_removed": "^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$", + + "emoji_reaction_ios_generic_added": "^Reacted (.+?) to \u201C(.+?)\u201D$", + "emoji_reaction_ios_generic_removed": "^Removed (.+?) from \u201C(.+?)\u201D$", + + "emoji_reaction_ios_heart_added": "^Loved \u201C(.+?)\u201D$", + "emoji_reaction_ios_heart_removed": "^Removed a heart from \u201C(.+?)\u201D$", + + "emoji_reaction_ios_like_added": "^Liked \u201C(.+?)\u201D$", + "emoji_reaction_ios_like_removed": "^Removed a like from \u201C(.+?)\u201D$", + + "emoji_reaction_ios_dislike_added": "^Disliked \u201C(.+?)\u201D$", + "emoji_reaction_ios_dislike_removed": "^Removed a dislike from \u201C(.+?)\u201D$", + + "emoji_reaction_ios_laugh_added": "^Laughed at \u201C(.+?)\u201D$", + "emoji_reaction_ios_laugh_removed": "^Removed a laugh from \u201C(.+?)\u201D$", + + "emoji_reaction_ios_exclamation_added": "^Emphasized \u201C(.+?)\u201D$", + "emoji_reaction_ios_exclamation_removed": "^Removed an exclamation from \u201C(.+?)\u201D$", + + "emoji_reaction_ios_question_mark_added": "^Questioned \u201C(.+?)\u201D$", + "emoji_reaction_ios_question_mark_removed": "^Removed a question mark from \u201C(.+?)\u201D$" +} diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt new file mode 100644 index 00000000..0ae1b12b --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt @@ -0,0 +1,31 @@ +package dev.octoshrimpy.quik.repository + +import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass + +@JsonClass(generateAdapter = false) +data class EmojiPatternStrings( + @Json(name = "emoji_reaction_google_messages_added") val googleAdded: String, + @Json(name = "emoji_reaction_google_messages_removed") val googleRemoved: String, + + @Json(name = "emoji_reaction_ios_generic_added") val iosGenericAdded: String, + @Json(name = "emoji_reaction_ios_generic_removed") val iosGenericRemoved: String, + + @Json(name = "emoji_reaction_ios_heart_added") val iosHeartAdded: String, + @Json(name = "emoji_reaction_ios_heart_removed") val iosHeartRemoved: String, + + @Json(name = "emoji_reaction_ios_like_added") val iosLikeAdded: String, + @Json(name = "emoji_reaction_ios_like_removed") val iosLikeRemoved: String, + + @Json(name = "emoji_reaction_ios_dislike_added") val iosDislikeAdded: String, + @Json(name = "emoji_reaction_ios_dislike_removed") val iosDislikeRemoved: String, + + @Json(name = "emoji_reaction_ios_laugh_added") val iosLaughAdded: String, + @Json(name = "emoji_reaction_ios_laugh_removed") val iosLaughRemoved: String, + + @Json(name = "emoji_reaction_ios_exclamation_added") val iosExclamationAdded: String, + @Json(name = "emoji_reaction_ios_exclamation_removed") val iosExclamationRemoved: String, + + @Json(name = "emoji_reaction_ios_question_mark_added") val iosQuestionMarkAdded: String, + @Json(name = "emoji_reaction_ios_question_mark_removed") val iosQuestionMarkRemoved: String, +) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 2b077e18..0ba0737b 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -18,19 +18,98 @@ */ package dev.octoshrimpy.quik.repository +import android.content.Context +import com.squareup.moshi.Moshi import dev.octoshrimpy.quik.manager.KeyManager import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message -import dev.octoshrimpy.quik.repository.EmojiReactionUtils.reactionPatterns -import dev.octoshrimpy.quik.repository.EmojiReactionUtils.removalPatterns import io.realm.Realm import io.realm.Sort import timber.log.Timber import javax.inject.Inject class EmojiReactionRepositoryImpl @Inject constructor( - private val keyManager: KeyManager + private val context: Context, + private val keyManager: KeyManager, + private val moshi: Moshi, ) : EmojiReactionRepository { + + // We use an ordered map to make sure we test tapback regexes before generic ones + private val reactionPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf() + private val removalPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf() + + init { + val assetEntries = loadEmojiPatternEntriesFromAssets() + assetEntries.forEach { (localeTag, strings) -> + try { + addPatternsForLocaleStrings(localeTag, strings, reactionPatterns, removalPatterns) + } catch (e: Exception) { + Timber.w(e, "Failed to load asset patterns for locale: $localeTag") + } + } + Timber.i("Loaded emoji reaction patterns for locales: ${assetEntries.map { it.first }}") + } + + private fun addPatternsForLocaleStrings( + localeTag: String, + strings: EmojiPatternStrings, + reactionPatterns: LinkedHashMap ParsedEmojiReaction?>, + removalPatterns: LinkedHashMap ParsedEmojiReaction?> + ) { + // Google Messages + reactionPatterns[Regex(strings.googleAdded)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) } + removalPatterns[Regex(strings.googleRemoved)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) } + + // iOS tapbacks (order matters: specific before generic) + val tapbacks = listOf( + Triple("❤️", strings.iosHeartAdded, strings.iosHeartRemoved), + Triple("👍", strings.iosLikeAdded, strings.iosLikeRemoved), + Triple("👎", strings.iosDislikeAdded, strings.iosDislikeRemoved), + Triple("😂", strings.iosLaughAdded, strings.iosLaughRemoved), + Triple("‼️", strings.iosExclamationAdded, strings.iosExclamationRemoved), + Triple("❓", strings.iosQuestionMarkAdded, strings.iosQuestionMarkRemoved) + ) + tapbacks.forEach { (emoji, added, removed) -> + reactionPatterns[Regex(added)] = { match -> ParsedEmojiReaction(emoji, match.groupValues[1]) } + + removalPatterns[Regex(removed)] = { match -> ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval = true) } + } + + // Generic iOS emoji patterns + reactionPatterns[Regex(strings.iosGenericAdded)] = { match -> + if (match.groupValues.getOrNull(1) == "with a sticker") null // TODO: localize "with a sticker" + else ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + } + removalPatterns[Regex(strings.iosGenericRemoved)] = { match -> + // TODO: sticker? + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + } + + Timber.d("Loaded emoji regex patterns for $localeTag from assets") + } + + private fun loadEmojiPatternEntriesFromAssets(): List> { + val dir = "emojis" + val files = context.assets.list(dir) ?: emptyArray() + return files.filter { it.endsWith(".json", ignoreCase = true) } + .mapNotNull { filename -> + val localeTag = filename.removeSuffix(".json") + try { + val json = context.assets.open("$dir/$filename").bufferedReader().use { it.readText() } + val data = parseEmojiPatternsJson(json) + localeTag to data + } catch (e: Exception) { + Timber.w(e, "Failed parsing emoji patterns asset: $filename") + null + } + } + } + + private fun parseEmojiPatternsJson(json: String): EmojiPatternStrings { + val adapter = moshi.adapter(EmojiPatternStrings::class.java) + return requireNotNull(adapter.fromJson(json)) { "Invalid emoji patterns JSON" } + } + override fun parseEmojiReaction(body: String): ParsedEmojiReaction? { val removal = parseRemoval(body) if (removal != null) return removal @@ -68,7 +147,11 @@ class EmojiReactionRepositoryImpl @Inject constructor( * Search for messages in the same thread with matching text content * We'll search recent messages first */ - override fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { + override fun findTargetMessage( + threadId: Long, + originalMessageText: String, + realm: Realm + ): Message? { val startTime = System.currentTimeMillis() val messages = realm.where(Message::class.java) .equalTo("threadId", threadId) @@ -93,7 +176,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( reactionMessage: Message, reaction: ParsedEmojiReaction, targetMessage: Message?, - realm: Realm, ) { if (targetMessage == null) { Timber.w("Cannot remove emoji reaction '${reaction.emoji}': no target message found") @@ -122,7 +204,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( realm: Realm, ) { if (parsedReaction.isRemoval) { - removeEmojiReaction(reactionMessage, parsedReaction, targetMessage, realm) + removeEmojiReaction(reactionMessage, parsedReaction, targetMessage) return } @@ -193,50 +275,3 @@ class EmojiReactionRepositoryImpl @Inject constructor( } } - -object EmojiReactionUtils { - private fun tapback(emoji: String, isRemoval: Boolean = false): (MatchResult) -> ParsedEmojiReaction { - return { match -> - ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval) - } - } - - val reactionPatterns: Map ParsedEmojiReaction?> = mapOf( - // Google Messages - https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 - Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) - }, - // iOS - Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") to { match -> - if (match.groupValues[1] == "with a sticker") - null - else - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) - }, - // iOS tapbacks - Regex("^Loved \u201C(.+?)\u201D$") to tapback("❤️"), - Regex("^Liked \u201C(.+?)\u201D$") to tapback("👍"), - Regex("^Disliked \u201C(.+?)\u201D$") to tapback("👎"), - Regex("^Laughed at \u201C(.+?)\u201D$") to tapback("😂"), - Regex("^Emphasized \u201C(.+?)\u201D$") to tapback("‼️"), - Regex("^Questioned \u201C(.+?)\u201D$") to tapback("❓"), - ) - - val removalPatterns: Map ParsedEmojiReaction?> = mapOf( - // Google Messages - Regex("^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) - }, - // iOS tapbacks - Regex("^Removed a heart from \u201C(.+?)\u201D$") to tapback("❤️", true), - Regex("^Removed a like from \u201C(.+?)\u201D$") to tapback("👍", true), - Regex("^Removed a dislike from \u201C(.+?)\u201D$") to tapback("👎", true), - Regex("^Removed a laugh from \u201C(.+?)\u201D$") to tapback("😂", true), - Regex("^Removed an exclamation from \u201C(.+?)\u201D$") to tapback("‼️", true), - Regex("^Removed a question mark from \u201C(.+?)\u201D$") to tapback("❓", true), - // iOS emoji - keep this below tapbacks as this regex would otherwise also match the patterns above - Regex("^Removed (.+?) from \u201C(.+?)\u201D$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) - }, - ) -} diff --git a/presentation/build.gradle b/presentation/build.gradle index ef9cd9c0..aecce717 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -95,6 +95,13 @@ android { signingConfigs.release.keyAlias = System.getenv("key_alias") signingConfigs.release.keyPassword = System.getenv("key_password") } + + bundle { + language { + // avoid splitting out languages because we want to handle an emoji reaction in any language + enableSplit = false + } + } } androidExtensions { From 2ab9ef398132a61bda210ee37c7726c720e630d4 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Thu, 4 Sep 2025 00:56:57 -0400 Subject: [PATCH 20/33] Make localization easier use unicode chars, and allow partial jsons --- data/src/main/assets/emojis/en.json | 32 +++++++------- data/src/main/assets/emojis/ru.json | 4 ++ .../repository/EmojiReactionRepositoryImpl.kt | 42 ++++++++++++------- .../EmojiPatternStrings.kt | 36 ++++++++-------- 4 files changed, 65 insertions(+), 49 deletions(-) create mode 100644 data/src/main/assets/emojis/ru.json rename data/src/main/java/com/moez/QKSMS/{repository => util}/EmojiPatternStrings.kt (70%) diff --git a/data/src/main/assets/emojis/en.json b/data/src/main/assets/emojis/en.json index 402dbdb1..4cd968b6 100644 --- a/data/src/main/assets/emojis/en.json +++ b/data/src/main/assets/emojis/en.json @@ -1,25 +1,25 @@ { - "emoji_reaction_google_messages_added": "^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$", - "emoji_reaction_google_messages_removed": "^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$", + "emoji_reaction_google_messages_added": "^\u200A\u200B(.+?)\u200B to “\u200A(.+?)\u200A”\u200A$", + "emoji_reaction_google_messages_removed": "^\u200ARemoved \u200C(.+?)\u200C from “\u200A(.+?)\u200A”\u200A$", - "emoji_reaction_ios_generic_added": "^Reacted (.+?) to \u201C(.+?)\u201D$", - "emoji_reaction_ios_generic_removed": "^Removed (.+?) from \u201C(.+?)\u201D$", + "emoji_reaction_ios_generic_added": "^Reacted (.+?) to “(.+?)”$", + "emoji_reaction_ios_generic_removed": "^Removed (.+?) from “(.+?)”$", - "emoji_reaction_ios_heart_added": "^Loved \u201C(.+?)\u201D$", - "emoji_reaction_ios_heart_removed": "^Removed a heart from \u201C(.+?)\u201D$", + "emoji_reaction_ios_heart_added": "^Loved “(.+?)”$", + "emoji_reaction_ios_heart_removed": "^Removed a heart from “(.+?)”$", - "emoji_reaction_ios_like_added": "^Liked \u201C(.+?)\u201D$", - "emoji_reaction_ios_like_removed": "^Removed a like from \u201C(.+?)\u201D$", + "emoji_reaction_ios_like_added": "^Liked “(.+?)”$", + "emoji_reaction_ios_like_removed": "^Removed a like from “(.+?)”$", - "emoji_reaction_ios_dislike_added": "^Disliked \u201C(.+?)\u201D$", - "emoji_reaction_ios_dislike_removed": "^Removed a dislike from \u201C(.+?)\u201D$", + "emoji_reaction_ios_dislike_added": "^Disliked “(.+?)”$", + "emoji_reaction_ios_dislike_removed": "^Removed a dislike from “(.+?)”$", - "emoji_reaction_ios_laugh_added": "^Laughed at \u201C(.+?)\u201D$", - "emoji_reaction_ios_laugh_removed": "^Removed a laugh from \u201C(.+?)\u201D$", + "emoji_reaction_ios_laugh_added": "^Laughed at “(.+?)”$", + "emoji_reaction_ios_laugh_removed": "^Removed a laugh from “(.+?)”$", - "emoji_reaction_ios_exclamation_added": "^Emphasized \u201C(.+?)\u201D$", - "emoji_reaction_ios_exclamation_removed": "^Removed an exclamation from \u201C(.+?)\u201D$", + "emoji_reaction_ios_exclamation_added": "^Emphasized “(.+?)”$", + "emoji_reaction_ios_exclamation_removed": "^Removed an exclamation from “(.+?)”$", - "emoji_reaction_ios_question_mark_added": "^Questioned \u201C(.+?)\u201D$", - "emoji_reaction_ios_question_mark_removed": "^Removed a question mark from \u201C(.+?)\u201D$" + "emoji_reaction_ios_question_mark_added": "^Questioned “(.+?)”$", + "emoji_reaction_ios_question_mark_removed": "^Removed a question mark from “(.+?)”$" } diff --git a/data/src/main/assets/emojis/ru.json b/data/src/main/assets/emojis/ru.json new file mode 100644 index 00000000..dcafcd58 --- /dev/null +++ b/data/src/main/assets/emojis/ru.json @@ -0,0 +1,4 @@ +{ + "emoji_reaction_google_messages_added": "^\u200AРеакция \u200B(.+?)\u200B на \"\u200A(.+?)\u200A\"\u200A$", + "emoji_reaction_google_messages_removed": "^\u200AРеакция \u200C(.+?)\u200C удалена из \"\u200A(.+?)\u200A\"\u200A$" +} diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 0ba0737b..d072374c 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -23,6 +23,7 @@ import com.squareup.moshi.Moshi import dev.octoshrimpy.quik.manager.KeyManager import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message +import dev.octoshrimpy.quik.util.EmojiPatternStrings import io.realm.Realm import io.realm.Sort import timber.log.Timber @@ -57,32 +58,43 @@ class EmojiReactionRepositoryImpl @Inject constructor( removalPatterns: LinkedHashMap ParsedEmojiReaction?> ) { // Google Messages - reactionPatterns[Regex(strings.googleAdded)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) } - removalPatterns[Regex(strings.googleRemoved)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) } + strings.googleAdded?.let { pattern -> + reactionPatterns[Regex(pattern)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) } + } + strings.googleRemoved?.let { pattern -> + removalPatterns[Regex(pattern)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) } + } - // iOS tapbacks (order matters: specific before generic) - val tapbacks = listOf( + // iOS tapbacks (important to add these before generic emoji patterns as the regexes may overlap) + listOf( Triple("❤️", strings.iosHeartAdded, strings.iosHeartRemoved), Triple("👍", strings.iosLikeAdded, strings.iosLikeRemoved), Triple("👎", strings.iosDislikeAdded, strings.iosDislikeRemoved), Triple("😂", strings.iosLaughAdded, strings.iosLaughRemoved), Triple("‼️", strings.iosExclamationAdded, strings.iosExclamationRemoved), Triple("❓", strings.iosQuestionMarkAdded, strings.iosQuestionMarkRemoved) - ) - tapbacks.forEach { (emoji, added, removed) -> - reactionPatterns[Regex(added)] = { match -> ParsedEmojiReaction(emoji, match.groupValues[1]) } - - removalPatterns[Regex(removed)] = { match -> ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval = true) } + ).forEach { (emoji, added, removed) -> + added?.let { + reactionPatterns[Regex(it)] = + { match -> ParsedEmojiReaction(emoji, match.groupValues[1]) } + } + removed?.let { + removalPatterns[Regex(it)] = + { match -> ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval = true) } + } } // Generic iOS emoji patterns - reactionPatterns[Regex(strings.iosGenericAdded)] = { match -> - if (match.groupValues.getOrNull(1) == "with a sticker") null // TODO: localize "with a sticker" - else ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + strings.iosGenericAdded?.let { pattern -> + reactionPatterns[Regex(pattern)] = { match -> + if (match.groupValues.getOrNull(1) == "with a sticker") null // TODO: localize "with a sticker" + else ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + } } - removalPatterns[Regex(strings.iosGenericRemoved)] = { match -> - // TODO: sticker? - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + strings.iosGenericRemoved?.let { pattern -> + removalPatterns[Regex(pattern)] = { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + } } Timber.d("Loaded emoji regex patterns for $localeTag from assets") diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt similarity index 70% rename from data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt rename to data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt index 0ae1b12b..a5ea71d1 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt @@ -1,31 +1,31 @@ -package dev.octoshrimpy.quik.repository +package dev.octoshrimpy.quik.util import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = false) data class EmojiPatternStrings( - @Json(name = "emoji_reaction_google_messages_added") val googleAdded: String, - @Json(name = "emoji_reaction_google_messages_removed") val googleRemoved: String, + @Json(name = "emoji_reaction_google_messages_added") val googleAdded: String? = null, + @Json(name = "emoji_reaction_google_messages_removed") val googleRemoved: String? = null, - @Json(name = "emoji_reaction_ios_generic_added") val iosGenericAdded: String, - @Json(name = "emoji_reaction_ios_generic_removed") val iosGenericRemoved: String, + @Json(name = "emoji_reaction_ios_generic_added") val iosGenericAdded: String? = null, + @Json(name = "emoji_reaction_ios_generic_removed") val iosGenericRemoved: String? = null, - @Json(name = "emoji_reaction_ios_heart_added") val iosHeartAdded: String, - @Json(name = "emoji_reaction_ios_heart_removed") val iosHeartRemoved: String, + @Json(name = "emoji_reaction_ios_heart_added") val iosHeartAdded: String? = null, + @Json(name = "emoji_reaction_ios_heart_removed") val iosHeartRemoved: String? = null, - @Json(name = "emoji_reaction_ios_like_added") val iosLikeAdded: String, - @Json(name = "emoji_reaction_ios_like_removed") val iosLikeRemoved: String, + @Json(name = "emoji_reaction_ios_like_added") val iosLikeAdded: String? = null, + @Json(name = "emoji_reaction_ios_like_removed") val iosLikeRemoved: String? = null, - @Json(name = "emoji_reaction_ios_dislike_added") val iosDislikeAdded: String, - @Json(name = "emoji_reaction_ios_dislike_removed") val iosDislikeRemoved: String, + @Json(name = "emoji_reaction_ios_dislike_added") val iosDislikeAdded: String? = null, + @Json(name = "emoji_reaction_ios_dislike_removed") val iosDislikeRemoved: String? = null, - @Json(name = "emoji_reaction_ios_laugh_added") val iosLaughAdded: String, - @Json(name = "emoji_reaction_ios_laugh_removed") val iosLaughRemoved: String, + @Json(name = "emoji_reaction_ios_laugh_added") val iosLaughAdded: String? = null, + @Json(name = "emoji_reaction_ios_laugh_removed") val iosLaughRemoved: String? = null, - @Json(name = "emoji_reaction_ios_exclamation_added") val iosExclamationAdded: String, - @Json(name = "emoji_reaction_ios_exclamation_removed") val iosExclamationRemoved: String, + @Json(name = "emoji_reaction_ios_exclamation_added") val iosExclamationAdded: String? = null, + @Json(name = "emoji_reaction_ios_exclamation_removed") val iosExclamationRemoved: String? = null, - @Json(name = "emoji_reaction_ios_question_mark_added") val iosQuestionMarkAdded: String, - @Json(name = "emoji_reaction_ios_question_mark_removed") val iosQuestionMarkRemoved: String, -) + @Json(name = "emoji_reaction_ios_question_mark_added") val iosQuestionMarkAdded: String? = null, + @Json(name = "emoji_reaction_ios_question_mark_removed") val iosQuestionMarkRemoved: String? = null, +) \ No newline at end of file From 0e522f034655d35d89c8d67881e1a97c2f21b21e Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Thu, 4 Sep 2025 01:19:26 -0400 Subject: [PATCH 21/33] add more russian regexes --- data/src/main/assets/emojis/ru.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/data/src/main/assets/emojis/ru.json b/data/src/main/assets/emojis/ru.json index dcafcd58..9c0b3e13 100644 --- a/data/src/main/assets/emojis/ru.json +++ b/data/src/main/assets/emojis/ru.json @@ -1,4 +1,16 @@ { "emoji_reaction_google_messages_added": "^\u200AРеакция \u200B(.+?)\u200B на \"\u200A(.+?)\u200A\"\u200A$", - "emoji_reaction_google_messages_removed": "^\u200AРеакция \u200C(.+?)\u200C удалена из \"\u200A(.+?)\u200A\"\u200A$" + "emoji_reaction_google_messages_removed": "^\u200AРеакция \u200C(.+?)\u200C удалена из \"\u200A(.+?)\u200A\"\u200A$", + + "emoji_reaction_ios_heart_added": "^Очень понравилось «(.+?)»$", + + "emoji_reaction_ios_like_added": "^Понравилось «(.+?)»$", + + "emoji_reaction_ios_dislike_added": "^Не понравилось «(.+?)»$", + + "emoji_reaction_ios_laugh_added": "^Посмеялись над «(.+?)»$", + + "emoji_reaction_ios_exclamation_added": "^Отмечено «(.+?)»$", + + "emoji_reaction_ios_question_mark_added": "^Поставлен вопрос на «(.+?)»$" } From bb6379446a99265795f9df788d33ef45281fcf09 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Thu, 4 Sep 2025 14:40:28 -0400 Subject: [PATCH 22/33] use generic google messages regex --- data/src/main/assets/emojis/en.json | 3 --- data/src/main/assets/emojis/ru.json | 3 --- .../repository/EmojiReactionRepositoryImpl.kt | 23 +++++++++---------- .../moez/QKSMS/util/EmojiPatternStrings.kt | 3 --- 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/data/src/main/assets/emojis/en.json b/data/src/main/assets/emojis/en.json index 4cd968b6..513b7e47 100644 --- a/data/src/main/assets/emojis/en.json +++ b/data/src/main/assets/emojis/en.json @@ -1,7 +1,4 @@ { - "emoji_reaction_google_messages_added": "^\u200A\u200B(.+?)\u200B to “\u200A(.+?)\u200A”\u200A$", - "emoji_reaction_google_messages_removed": "^\u200ARemoved \u200C(.+?)\u200C from “\u200A(.+?)\u200A”\u200A$", - "emoji_reaction_ios_generic_added": "^Reacted (.+?) to “(.+?)”$", "emoji_reaction_ios_generic_removed": "^Removed (.+?) from “(.+?)”$", diff --git a/data/src/main/assets/emojis/ru.json b/data/src/main/assets/emojis/ru.json index 9c0b3e13..c6416422 100644 --- a/data/src/main/assets/emojis/ru.json +++ b/data/src/main/assets/emojis/ru.json @@ -1,7 +1,4 @@ { - "emoji_reaction_google_messages_added": "^\u200AРеакция \u200B(.+?)\u200B на \"\u200A(.+?)\u200A\"\u200A$", - "emoji_reaction_google_messages_removed": "^\u200AРеакция \u200C(.+?)\u200C удалена из \"\u200A(.+?)\u200A\"\u200A$", - "emoji_reaction_ios_heart_added": "^Очень понравилось «(.+?)»$", "emoji_reaction_ios_like_added": "^Понравилось «(.+?)»$", diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index d072374c..5aa6607e 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -34,10 +34,17 @@ class EmojiReactionRepositoryImpl @Inject constructor( private val keyManager: KeyManager, private val moshi: Moshi, ) : EmojiReactionRepository { - - // We use an ordered map to make sure we test tapback regexes before generic ones - private val reactionPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf() - private val removalPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf() + // We use an ordered map to make sure we can test tapback regexes before generic ones + private val reactionPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf( + Regex( // Google Messages + "(?s)^\u200a[^\u200b\u200a]*\u200b([^\u200b]*)\u200b[^\u200b\u200a]*\u200a(.*)\u200a[^\u200b\u200a]*\u200a\\Z" + ) to { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) } + ) + private val removalPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf( + Regex( // Google Messages + "(?s)^\u200a[^\u200c\u200a]*\u200c([^\u200c]*)\u200c[^\u200c\u200a]*\u200a(.*)\u200a[^\u200c\u200a]*\u200a\\Z" + ) to { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) } + ) init { val assetEntries = loadEmojiPatternEntriesFromAssets() @@ -57,14 +64,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( reactionPatterns: LinkedHashMap ParsedEmojiReaction?>, removalPatterns: LinkedHashMap ParsedEmojiReaction?> ) { - // Google Messages - strings.googleAdded?.let { pattern -> - reactionPatterns[Regex(pattern)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) } - } - strings.googleRemoved?.let { pattern -> - removalPatterns[Regex(pattern)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) } - } - // iOS tapbacks (important to add these before generic emoji patterns as the regexes may overlap) listOf( Triple("❤️", strings.iosHeartAdded, strings.iosHeartRemoved), diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt index a5ea71d1..1b04e13c 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt @@ -5,9 +5,6 @@ import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = false) data class EmojiPatternStrings( - @Json(name = "emoji_reaction_google_messages_added") val googleAdded: String? = null, - @Json(name = "emoji_reaction_google_messages_removed") val googleRemoved: String? = null, - @Json(name = "emoji_reaction_ios_generic_added") val iosGenericAdded: String? = null, @Json(name = "emoji_reaction_ios_generic_removed") val iosGenericRemoved: String? = null, From 01a52f51a7f51b3727d705de1ac8894e6a720331 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Sun, 7 Sep 2025 01:27:56 -0400 Subject: [PATCH 23/33] cleanup --- .../main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt | 2 +- .../src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt | 2 +- domain/src/main/java/com/moez/QKSMS/model/Message.kt | 2 -- .../com/moez/QKSMS/repository/EmojiReactionRepository.kt | 2 +- presentation/build.gradle | 7 ------- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt index 1b04e13c..d2509232 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt @@ -25,4 +25,4 @@ data class EmojiPatternStrings( @Json(name = "emoji_reaction_ios_question_mark_added") val iosQuestionMarkAdded: String? = null, @Json(name = "emoji_reaction_ios_question_mark_removed") val iosQuestionMarkRemoved: String? = null, -) \ No newline at end of file +) diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt index cb9013f6..1801df38 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt @@ -22,4 +22,4 @@ import io.realm.RealmObject open class EmojiSyncNeeded : RealmObject() { var createdAt: Long = System.currentTimeMillis() -} \ No newline at end of file +} 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 5f516eeb..51029f15 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt @@ -74,9 +74,7 @@ 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 { diff --git a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt index 15f1fdd0..8c648249 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt @@ -36,4 +36,4 @@ interface EmojiReactionRepository { ) fun deleteAndReparseAllEmojiReactions(realm: Realm) -} \ No newline at end of file +} diff --git a/presentation/build.gradle b/presentation/build.gradle index aecce717..ef9cd9c0 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -95,13 +95,6 @@ android { signingConfigs.release.keyAlias = System.getenv("key_alias") signingConfigs.release.keyPassword = System.getenv("key_password") } - - bundle { - language { - // avoid splitting out languages because we want to handle an emoji reaction in any language - enableSplit = false - } - } } androidExtensions { From e30bf373481f34941e0f04cba82dc951b893da95 Mon Sep 17 00:00:00 2001 From: Ben Iofel <1713819+benwaffle@users.noreply.github.com> Date: Sat, 13 Sep 2025 02:05:06 -0400 Subject: [PATCH 24/33] Apply suggestion from @Inhishonor Co-authored-by: Inhishonor --- data/src/main/assets/emojis/en.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/data/src/main/assets/emojis/en.json b/data/src/main/assets/emojis/en.json index 513b7e47..e36ffacd 100644 --- a/data/src/main/assets/emojis/en.json +++ b/data/src/main/assets/emojis/en.json @@ -1,22 +1,22 @@ { - "emoji_reaction_ios_generic_added": "^Reacted (.+?) to “(.+?)”$", - "emoji_reaction_ios_generic_removed": "^Removed (.+?) from “(.+?)”$", + "emoji_reaction_ios_generic_added": "^(?s)Reacted (.+?) to “(.+?)”$", + "emoji_reaction_ios_generic_removed": "^(?s)Removed (.+?) from “(.+?)”$", - "emoji_reaction_ios_heart_added": "^Loved “(.+?)”$", - "emoji_reaction_ios_heart_removed": "^Removed a heart from “(.+?)”$", + "emoji_reaction_ios_heart_added": "^(?s)Loved “(.+?)”$", + "emoji_reaction_ios_heart_removed": "^(?s)Removed a heart from “(.+?)”$", - "emoji_reaction_ios_like_added": "^Liked “(.+?)”$", - "emoji_reaction_ios_like_removed": "^Removed a like from “(.+?)”$", + "emoji_reaction_ios_like_added": "^(?s)Liked “(.+?)”$", + "emoji_reaction_ios_like_removed": "^(?s)Removed a like from “(.+?)”$", - "emoji_reaction_ios_dislike_added": "^Disliked “(.+?)”$", - "emoji_reaction_ios_dislike_removed": "^Removed a dislike from “(.+?)”$", + "emoji_reaction_ios_dislike_added": "^(?s)Disliked “(.+?)”$", + "emoji_reaction_ios_dislike_removed": "^(?s)Removed a dislike from “(.+?)”$", - "emoji_reaction_ios_laugh_added": "^Laughed at “(.+?)”$", - "emoji_reaction_ios_laugh_removed": "^Removed a laugh from “(.+?)”$", + "emoji_reaction_ios_laugh_added": "^(?s)Laughed at “(.+?)”$", + "emoji_reaction_ios_laugh_removed": "^(?s)Removed a laugh from “(.+?)”$", - "emoji_reaction_ios_exclamation_added": "^Emphasized “(.+?)”$", - "emoji_reaction_ios_exclamation_removed": "^Removed an exclamation from “(.+?)”$", + "emoji_reaction_ios_exclamation_added": "^(?s)Emphasized “(.+?)”$", + "emoji_reaction_ios_exclamation_removed": "^(?s)Removed an exclamation from “(.+?)”$", - "emoji_reaction_ios_question_mark_added": "^Questioned “(.+?)”$", - "emoji_reaction_ios_question_mark_removed": "^Removed a question mark from “(.+?)”$" + "emoji_reaction_ios_question_mark_added": "^(?s)Questioned “(.+?)”$", + "emoji_reaction_ios_question_mark_removed": "^(?s)Removed a question mark from “(.+?)”$" } From fb28453b39dee71f040f414fb755037b20051ec2 Mon Sep 17 00:00:00 2001 From: Ben Iofel <1713819+benwaffle@users.noreply.github.com> Date: Sat, 13 Sep 2025 02:05:13 -0400 Subject: [PATCH 25/33] Apply suggestion from @Inhishonor Co-authored-by: Inhishonor --- data/src/main/assets/emojis/ru.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/src/main/assets/emojis/ru.json b/data/src/main/assets/emojis/ru.json index c6416422..f93d0e96 100644 --- a/data/src/main/assets/emojis/ru.json +++ b/data/src/main/assets/emojis/ru.json @@ -1,13 +1,13 @@ { - "emoji_reaction_ios_heart_added": "^Очень понравилось «(.+?)»$", + "emoji_reaction_ios_heart_added": "^(?s)Очень понравилось «(.+?)»$", - "emoji_reaction_ios_like_added": "^Понравилось «(.+?)»$", + "emoji_reaction_ios_like_added": "^(?s)Понравилось «(.+?)»$", - "emoji_reaction_ios_dislike_added": "^Не понравилось «(.+?)»$", + "emoji_reaction_ios_dislike_added": "^(?s)Не понравилось «(.+?)»$", - "emoji_reaction_ios_laugh_added": "^Посмеялись над «(.+?)»$", + "emoji_reaction_ios_laugh_added": "^(?s)Посмеялись над «(.+?)»$", - "emoji_reaction_ios_exclamation_added": "^Отмечено «(.+?)»$", + "emoji_reaction_ios_exclamation_added": "^(?s)Отмечено «(.+?)»$", - "emoji_reaction_ios_question_mark_added": "^Поставлен вопрос на «(.+?)»$" + "emoji_reaction_ios_question_mark_added": "^(?s)Поставлен вопрос на «(.+?)»$" } From ed63d27511dac290e0aa63232426848c49d4cff4 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Sat, 13 Sep 2025 17:21:16 -0400 Subject: [PATCH 26/33] fix emoji count wrapping --- .../java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt | 5 +++-- presentation/src/main/res/layout/message_list_item_in.xml | 3 ++- presentation/src/main/res/layout/message_list_item_out.xml | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) 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 a9cc89f1..b23c926a 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 @@ -411,7 +411,8 @@ class MessagesAdapter @Inject constructor( val reactionText = if (topReaction.second == 1) { topReaction.first } else { - "${topReaction.first} ${topReaction.second}" + // Use a non-breaking space to keep the emoji and count together + "${topReaction.first}\u00A0${topReaction.second}" } holder.reactionText?.text = reactionText @@ -516,4 +517,4 @@ class MessagesAdapter @Inject constructor( } } -} \ No newline at end of file +} diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index 0006b0dd..42b000fd 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -145,6 +145,7 @@ android:background="@drawable/message_only" android:backgroundTint="?android:attr/colorBackground" android:elevation="2dp" + android:maxLines="1" android:paddingStart="8dp" android:paddingTop="4dp" android:paddingEnd="8dp" @@ -176,4 +177,4 @@ - \ No newline at end of file + diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index 6c327730..f93de76d 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -183,6 +183,7 @@ android:background="@drawable/message_only" android:backgroundTint="?android:attr/colorBackground" android:elevation="2dp" + android:maxLines="1" android:paddingStart="8dp" android:paddingTop="4dp" android:paddingEnd="8dp" @@ -250,4 +251,4 @@ - \ No newline at end of file + From dbecaf12a48cf77930285a3fa53d8330abc79a95 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Sat, 13 Sep 2025 17:46:19 -0400 Subject: [PATCH 27/33] Show emoji reaction messages if target isn't found --- .../moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 5aa6607e..95fb48b7 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -190,7 +190,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( ) { if (targetMessage == null) { Timber.w("Cannot remove emoji reaction '${reaction.emoji}': no target message found") - reactionMessage.isEmojiReaction = true return } @@ -229,14 +228,13 @@ class EmojiReactionRepositoryImpl @Inject constructor( } realm.insertOrUpdate(reaction) - reactionMessage.isEmojiReaction = true - if (targetMessage != null) { + reactionMessage.isEmojiReaction = true 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}") + Timber.w("No target message, cannot save emoji reaction: ${reaction.emoji}") } } From a4e2ced6d87f0ec7a734d6bfb0ebeaf98b253a96 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Sat, 13 Sep 2025 18:02:35 -0400 Subject: [PATCH 28/33] overwrite emoji reactions with newer ones --- .../com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 95fb48b7..2a2b3324 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -230,6 +230,11 @@ class EmojiReactionRepositoryImpl @Inject constructor( if (targetMessage != null) { reactionMessage.isEmojiReaction = true + + // Overwrite any previous reaction from this sender for this target + val priorFromSender = targetMessage.emojiReactions.filter { it.senderAddress == reaction.senderAddress } + priorFromSender.forEach { it.deleteFromRealm() } + targetMessage.emojiReactions.add(reaction) Timber.i("Saved emoji reaction: ${reaction.emoji} to message ${targetMessage.id}") From f7ad9fe3a0d83aa530fd28f0d57e13c944f6609e Mon Sep 17 00:00:00 2001 From: Ben Iofel <1713819+benwaffle@users.noreply.github.com> Date: Sun, 21 Sep 2025 23:38:14 -0400 Subject: [PATCH 29/33] Apply suggestion from @Inhishonor Co-authored-by: Inhishonor --- .../com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 2a2b3324..28277ee1 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -258,8 +258,9 @@ class EmojiReactionRepositoryImpl @Inject constructor( .isNotEmpty("body") .endGroup() .or() - .beginGroup() + .beginGroup() .equalTo("type", "mms") + .notEqualTo("messageType", 130.toLong()) .isNotEmpty("parts.text") .endGroup() .endGroup() From 3ef51b74fe906eaf5dc9a72025f795ddad197fd2 Mon Sep 17 00:00:00 2001 From: Ben Iofel <1713819+benwaffle@users.noreply.github.com> Date: Mon, 22 Sep 2025 12:55:20 -0400 Subject: [PATCH 30/33] Update data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt Co-authored-by: Inhishonor --- .../com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 28277ee1..f081e490 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -258,7 +258,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( .isNotEmpty("body") .endGroup() .or() - .beginGroup() + .beginGroup() .equalTo("type", "mms") .notEqualTo("messageType", 130.toLong()) .isNotEmpty("parts.text") From 2511ed1a5e76f4fc940de15d050605a80b868206 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Sat, 27 Sep 2025 13:12:33 -0400 Subject: [PATCH 31/33] log --- .../com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index f081e490..f9298dd2 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -169,7 +169,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( .sort("date", Sort.DESCENDING) .findAll() val endTime = System.currentTimeMillis() - Timber.d("Found ${messages.size} messages as emoji targets in ${endTime - startTime}ms") + Timber.d("Found ${messages.size} messages as potential emoji targets in ${endTime - startTime}ms") val match = messages.find { message -> message.getText(false).trim() == originalMessageText.trim() From e28c47320014870520e8a0b4e9ac0c185719c36b Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 1 Oct 2025 00:43:55 -0400 Subject: [PATCH 32/33] Fix visible reaction messages --- .../moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index f9298dd2..81aba099 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -20,6 +20,7 @@ package dev.octoshrimpy.quik.repository import android.content.Context import com.squareup.moshi.Moshi +import dev.octoshrimpy.quik.extensions.insertOrUpdate import dev.octoshrimpy.quik.manager.KeyManager import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message @@ -187,6 +188,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( reactionMessage: Message, reaction: ParsedEmojiReaction, targetMessage: Message?, + realm: Realm, ) { if (targetMessage == null) { Timber.w("Cannot remove emoji reaction '${reaction.emoji}': no target message found") @@ -205,6 +207,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( } reactionMessage.isEmojiReaction = true + realm.insertOrUpdate(reactionMessage) } override fun saveEmojiReaction( @@ -214,7 +217,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( realm: Realm, ) { if (parsedReaction.isRemoval) { - removeEmojiReaction(reactionMessage, parsedReaction, targetMessage) + removeEmojiReaction(reactionMessage, parsedReaction, targetMessage, realm) return } @@ -230,6 +233,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( if (targetMessage != null) { reactionMessage.isEmojiReaction = true + realm.insertOrUpdate(reactionMessage) // Overwrite any previous reaction from this sender for this target val priorFromSender = targetMessage.emojiReactions.filter { it.senderAddress == reaction.senderAddress } From e290545fb4078db0bae3f38bc2356358461bc802 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 1 Oct 2025 00:57:11 -0400 Subject: [PATCH 33/33] Fix avatar alignment for incoming messages with emojis --- .../java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt | 2 +- presentation/src/main/res/layout/message_list_item_in.xml | 4 +++- presentation/src/main/res/layout/message_list_item_out.xml | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) 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 b23c926a..b6fd29c4 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 @@ -427,7 +427,7 @@ class MessagesAdapter @Inject constructor( private fun makeRoomForEmojis(holder: QkViewHolder) { val paddingBottom = 25.dpToPx(context) - (holder.reactions?.parent as? ViewGroup)?.let { parent -> + (holder.reactions?.parent?.parent as? ViewGroup)?.let { parent -> parent.setPadding( parent.paddingLeft, parent.paddingTop, diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index 42b000fd..792727ef 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -79,7 +79,9 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="parent"> + app:layout_constraintBottom_toBottomOf="parent" + android:clipToPadding="false" + android:clipChildren="false"> + android:orientation="horizontal" + android:clipChildren="false" + android:clipToPadding="false">