forked from upstream-mirrors/quik
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
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user