forked from upstream-mirrors/quik
Parse all emoji reactions on migration
This commit is contained in:
@@ -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++
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package dev.octoshrimpy.quik.model
|
||||
|
||||
import io.realm.RealmObject
|
||||
|
||||
open class EmojiSyncNeeded : RealmObject() {
|
||||
var createdAt: Long = System.currentTimeMillis()
|
||||
}
|
||||
@@ -16,4 +16,6 @@ interface EmojiReactionRepository {
|
||||
targetMessage: Message?,
|
||||
realm: Realm,
|
||||
)
|
||||
|
||||
fun deleteAndReparseAllEmojiReactions(realm: Realm)
|
||||
}
|
||||
@@ -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<MainView, MainState>(
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user