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,