Merge branch 'master' into upgrade-smsmms-group-individual-send-no-wait-appear-delayed-mms-mms-receive-to-worker-send-ack-mmsc

This commit is contained in:
Inhishonor
2025-10-09 18:01:59 -07:00
254 changed files with 2886 additions and 1596 deletions
@@ -28,7 +28,6 @@ import dev.octoshrimpy.quik.extensions.map
import io.reactivex.Completable
import io.reactivex.Single
import timber.log.Timber
import java.util.*
import javax.inject.Inject
class CallBlockerBlockingClient @Inject constructor(
@@ -20,12 +20,12 @@ package dev.octoshrimpy.quik.manager
import android.content.Context
import android.util.Log
import dev.octoshrimpy.quik.common.util.extensions.versionCode
import dev.octoshrimpy.quik.util.Preferences
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import com.squareup.moshi.Moshi
import com.squareup.moshi.Types
import dev.octoshrimpy.quik.common.util.extensions.versionCode
import dev.octoshrimpy.quik.util.Preferences
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import javax.inject.Inject
@@ -0,0 +1,10 @@
package dev.octoshrimpy.quik.manager
import javax.inject.Inject
class ReferralManagerImpl @Inject constructor() : ReferralManager {
override suspend fun trackReferrer() {
}
}
@@ -20,7 +20,9 @@ package dev.octoshrimpy.quik.mapper
import android.content.Context
import android.database.Cursor
import android.provider.Telephony.*
import android.provider.Telephony.Mms
import android.provider.Telephony.MmsSms
import android.provider.Telephony.Sms
import com.google.android.mms.pdu_alt.EncodedStringValue
import com.google.android.mms.pdu_alt.PduHeaders
import com.google.android.mms.pdu_alt.PduPersister
@@ -19,14 +19,12 @@
package dev.octoshrimpy.quik.mapper
import com.f2prateek.rx.preferences2.RxSharedPreferences
import dev.octoshrimpy.quik.manager.AnalyticsManager
import dev.octoshrimpy.quik.manager.RatingManager
import io.reactivex.rxkotlin.Observables
import javax.inject.Inject
class RatingManagerImpl @Inject constructor(
rxPrefs: RxSharedPreferences,
private val analyticsManager: AnalyticsManager
) : RatingManager {
companion object {
@@ -50,12 +48,10 @@ class RatingManagerImpl @Inject constructor(
}
override fun rate() {
// analyticsManager.track("Clicked Rate")
rated.set(true)
}
override fun dismiss() {
// analyticsManager.track("Clicked Rate (Dismiss)")
dismissed.set(true)
}
@@ -37,7 +37,7 @@ class QkRealmMigration @Inject constructor(
) : RealmMigration {
companion object {
const val SCHEMA_VERSION: Long = 12
const val SCHEMA_VERSION: Long = 14
}
@SuppressLint("ApplySharedPref")
@@ -234,8 +234,19 @@ class QkRealmMigration @Inject constructor(
version++
}
if (version == 11L) {
realm.schema.get("ScheduledMessage")
?.addField("conversationId", Long::class.java, FieldAttribute.REQUIRED)
// Because there was never any property associated with which conversation/recipients a scheduled message was for,
// we can't update this field on a realm migration. It will be set to a default of 0
realm.schema.create("MessageContentFilter")
.addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED)
.addField("value", String::class.java, FieldAttribute.REQUIRED)
.addField("caseSensitive", Boolean::class.java, FieldAttribute.REQUIRED)
.addField("isRegex", Boolean::class.java, FieldAttribute.REQUIRED)
.addField("includeContacts", Boolean::class.java, FieldAttribute.REQUIRED)
realm.schema.get("Conversation")
?.addField("sendAsGroup", Boolean::class.java, FieldAttribute.REQUIRED)
?.transform { conversation ->
@@ -248,6 +259,38 @@ class QkRealmMigration @Inject constructor(
realm.schema.get("Message")
?.addField("sendAsGroup", Boolean::class.java, FieldAttribute.REQUIRED)
version++
}
if (version == 12L) {
realm.schema.get("Conversation")
?.addField("draftDate", Long::class.java, FieldAttribute.REQUIRED)
version++
}
if (version == 13L) {
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)
.addField("emoji", String::class.java, FieldAttribute.REQUIRED)
.addField("originalMessageText", String::class.java, FieldAttribute.REQUIRED)
.addField("threadId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED)
realm.schema.get("Message")
?.addField("isEmojiReaction", Boolean::class.java, FieldAttribute.REQUIRED)
?.addRealmListField("emojiReactions", emojiReactionTable)
?.transform { msg ->
msg.setBoolean("isEmojiReaction", false)
}
realm.schema.create("EmojiSyncNeeded")
.addField("createdAt", Long::class.java, FieldAttribute.REQUIRED)
realm.createObject("EmojiSyncNeeded")
version++
}
@@ -18,14 +18,15 @@
*/
package dev.octoshrimpy.quik.receiver
import android.annotation.SuppressLint
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.blocking.BlockingClient
import dev.octoshrimpy.quik.interactor.MarkBlocked
import dev.octoshrimpy.quik.repository.ConversationRepository
import dev.octoshrimpy.quik.util.Preferences
import dagger.android.AndroidInjection
import io.reactivex.schedulers.Schedulers
import timber.log.Timber
import javax.inject.Inject
@@ -37,6 +38,7 @@ class BlockThreadReceiver : BroadcastReceiver() {
@Inject lateinit var markBlocked: MarkBlocked
@Inject lateinit var prefs: Preferences
@SuppressLint("CheckResult")
override fun onReceive(context: Context, intent: Intent) {
AndroidInjection.inject(this, context)
@@ -57,8 +59,14 @@ class BlockThreadReceiver : BroadcastReceiver() {
MarkBlocked.Params(listOf(threadId), prefs.blockingManager.get(), null)
)
)
.subscribe { goAsync().finish() }
.dispose()
.subscribe(
{
goAsync().finish()
},
{ error ->
Timber.e("BlockThreadReceiver", "blocking failed")
goAsync().finish()
}
)
}
}
@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import dev.octoshrimpy.quik.interactor.UpdateScheduledMessageAlarms
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.interactor.UpdateScheduledMessageAlarms
import javax.inject.Inject
class BootReceiver : BroadcastReceiver() {
@@ -24,9 +24,9 @@ import android.content.Intent
import android.os.Build
import android.provider.Telephony
import androidx.annotation.RequiresApi
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.interactor.SyncMessages
import dev.octoshrimpy.quik.util.Preferences
import dagger.android.AndroidInjection
import javax.inject.Inject
class DefaultSmsChangedReceiver : BroadcastReceiver() {
@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import dev.octoshrimpy.quik.interactor.DeleteMessages
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.interactor.DeleteMessages
import timber.log.Timber
import javax.inject.Inject
@@ -22,9 +22,9 @@ import android.app.Activity
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.interactor.MarkDelivered
import dev.octoshrimpy.quik.interactor.MarkDeliveryFailed
import dagger.android.AndroidInjection
import timber.log.Timber
import javax.inject.Inject
@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import dev.octoshrimpy.quik.util.NightModeManager
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.util.NightModeManager
import javax.inject.Inject
class NightModeReceiver : BroadcastReceiver() {
@@ -22,12 +22,12 @@ import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import androidx.core.app.RemoteInput
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.compat.SubscriptionManagerCompat
import dev.octoshrimpy.quik.interactor.MarkRead
import dev.octoshrimpy.quik.interactor.SendNewMessage
import dev.octoshrimpy.quik.repository.ConversationRepository
import dev.octoshrimpy.quik.repository.MessageRepository
import dagger.android.AndroidInjection
import javax.inject.Inject
class RemoteMessagingReceiver : BroadcastReceiver() {
@@ -21,9 +21,9 @@ package dev.octoshrimpy.quik.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.interactor.SendScheduledMessage
import dev.octoshrimpy.quik.repository.MessageRepository
import dagger.android.AndroidInjection
import timber.log.Timber
import javax.inject.Inject
@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import dev.octoshrimpy.quik.interactor.SyncMessage
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.interactor.SyncMessage
import javax.inject.Inject
/**
@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import dev.octoshrimpy.quik.interactor.SpeakThreads
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.interactor.SpeakThreads
import dev.octoshrimpy.quik.repository.ConversationRepository
import javax.inject.Inject
@@ -27,11 +27,11 @@ import android.provider.Telephony
import androidx.core.content.contentValuesOf
import androidx.core.net.toUri
import androidx.documentfile.provider.DocumentFile
import com.squareup.moshi.Moshi
import dev.octoshrimpy.quik.common.util.extensions.now
import dev.octoshrimpy.quik.model.BackupFile
import dev.octoshrimpy.quik.model.Message
import dev.octoshrimpy.quik.util.Preferences
import com.squareup.moshi.Moshi
import io.reactivex.Observable
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
@@ -40,7 +40,8 @@ import okio.buffer
import okio.source
import timber.log.Timber
import java.text.SimpleDateFormat
import java.util.*
import java.util.Locale
import java.util.Timer
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.concurrent.schedule
@@ -171,4 +171,14 @@ class ContactRepositoryImpl @Inject constructor(
}
}
override fun isContact(address: String): Boolean {
val uri : Uri
if (address.contains('@')) {
uri = Uri.withAppendedPath(Email.CONTENT_FILTER_URI, Uri.encode(address))
} else {
uri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address))
}
return context.contentResolver.query(uri, arrayOf(BaseColumns._ID), null, null, null)?.count!! > 0
}
}
@@ -355,6 +355,7 @@ class ConversationRepositoryImpl @Inject constructor(
realm.executeTransaction {
conversation?.takeIf { it.isValid }?.draft = draft
conversation?.takeIf { it.isValid }?.draftDate = System.currentTimeMillis()
}
}
@@ -0,0 +1,296 @@
/*
* 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 <http://www.gnu.org/licenses/>.
*/
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
import dev.octoshrimpy.quik.util.EmojiPatternStrings
import io.realm.Realm
import io.realm.Sort
import timber.log.Timber
import javax.inject.Inject
class EmojiReactionRepositoryImpl @Inject constructor(
private val context: Context,
private val keyManager: KeyManager,
private val moshi: Moshi,
) : EmojiReactionRepository {
// We use an ordered map to make sure we can test tapback regexes before generic ones
private val reactionPatterns: LinkedHashMap<Regex, (MatchResult) -> 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<Regex, (MatchResult) -> 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()
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<Regex, (MatchResult) -> ParsedEmojiReaction?>,
removalPatterns: LinkedHashMap<Regex, (MatchResult) -> ParsedEmojiReaction?>
) {
// 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)
).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
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])
}
}
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")
}
private fun loadEmojiPatternEntriesFromAssets(): List<Pair<String, EmojiPatternStrings>> {
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
for ((pattern, parser) in reactionPatterns) {
val match = pattern.find(body)
if (match == null) continue;
val result = parser(match)
if (result == null) continue
Timber.d("Reaction found with ${result.emoji}")
return result
}
return null
}
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("Removal found with ${result.emoji}")
return result
}
return null
}
/**
* 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? {
val startTime = System.currentTimeMillis()
val messages = realm.where(Message::class.java)
.equalTo("threadId", threadId)
.sort("date", Sort.DESCENDING)
.findAll()
val endTime = System.currentTimeMillis()
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()
}
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'")
return null
}
private fun removeEmojiReaction(
reactionMessage: Message,
reaction: ParsedEmojiReaction,
targetMessage: Message?,
realm: Realm,
) {
if (targetMessage == null) {
Timber.w("Cannot remove emoji reaction '${reaction.emoji}': no target message found")
return
}
val existingReaction = targetMessage.emojiReactions.find { candidate ->
candidate.senderAddress == reactionMessage.address && candidate.emoji == reaction.emoji
}
if (existingReaction != null) {
existingReaction.deleteFromRealm()
Timber.d("Removed emoji reaction: ${reaction.emoji} to message ${targetMessage.id}")
} else {
Timber.w("No existing emoji reaction found to remove: ${reaction.emoji} to message ${targetMessage.id}")
}
reactionMessage.isEmojiReaction = true
realm.insertOrUpdate(reactionMessage)
}
override fun saveEmojiReaction(
reactionMessage: Message,
parsedReaction: ParsedEmojiReaction,
targetMessage: Message?,
realm: Realm,
) {
if (parsedReaction.isRemoval) {
removeEmojiReaction(reactionMessage, parsedReaction, targetMessage, realm)
return
}
val reaction = EmojiReaction().apply {
id = keyManager.newId()
reactionMessageId = reactionMessage.id
senderAddress = reactionMessage.address
emoji = parsedReaction.emoji
originalMessageText = parsedReaction.originalMessage
threadId = reactionMessage.threadId
}
realm.insertOrUpdate(reaction)
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 }
priorFromSender.forEach { it.deleteFromRealm() }
targetMessage.emojiReactions.add(reaction)
Timber.i("Saved emoji reaction: ${reaction.emoji} to message ${targetMessage.id}")
} else {
Timber.w("No target message, cannot save emoji reaction: ${reaction.emoji}")
}
}
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")
.notEqualTo("messageType", 130.toLong())
.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")
}
}
@@ -0,0 +1,86 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* This file is part of QKSMS.
*
* 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 <http://www.gnu.org/licenses/>.
*/
package dev.octoshrimpy.quik.repository
import dev.octoshrimpy.quik.model.MessageContentFilter
import dev.octoshrimpy.quik.model.MessageContentFilterData
import io.realm.Realm
import io.realm.RealmResults
import javax.inject.Inject
class MessageContentFilterRepositoryImpl @Inject constructor() : MessageContentFilterRepository {
override fun createFilter(data: MessageContentFilterData) {
Realm.getDefaultInstance().use { realm ->
realm.refresh()
val maxId = realm.where(MessageContentFilter::class.java)
.max("id")?.toLong() ?: -1
realm.executeTransaction {
realm.insert(MessageContentFilter(maxId + 1, data.value, data.caseSensitive, data.isRegex, data.includeContacts))
}
}
}
override fun getMessageContentFilters(): RealmResults<MessageContentFilter> {
return Realm.getDefaultInstance()
.where(MessageContentFilter::class.java)
.findAllAsync()
}
override fun getMessageContentFilter(id: Long): MessageContentFilter? {
return Realm.getDefaultInstance()
.where(MessageContentFilter::class.java)
.equalTo("id", id)
.findFirst()
}
override fun isBlocked(messageBody: String, address: String, contactsRepo: ContactRepository): Boolean {
val isContact = contactsRepo.isContact(address)
return Realm.getDefaultInstance().use { realm ->
realm.where(MessageContentFilter::class.java)
.findAll()
.any { filter ->
if (isContact && !filter.includeContacts) {
false
} else if (filter.isRegex) {
Regex(filter.value).matches(messageBody)
} else if (filter.caseSensitive) {
val regexp = ".*\\b" + Regex.escape(filter.value) + "\\b.*"
Regex(regexp).matches(messageBody)
} else {
val regexp = ".*\\b" + Regex.escape(filter.value.lowercase()) + "\\b.*"
Regex(regexp).matches(messageBody.lowercase())
}
}
}
}
override fun removeFilter(id: Long) {
Realm.getDefaultInstance().use { realm ->
realm.executeTransaction {
realm.where(MessageContentFilter::class.java)
.equalTo("id", id)
.findAll()
.deleteAllFromRealm()
}
}
}
}
@@ -81,6 +81,8 @@ open class MessageRepositoryImpl @Inject constructor(
private val messageIds: KeyManager,
private val phoneNumberUtils: PhoneNumberUtils,
private val prefs: Preferences,
private val syncRepository: SyncRepository,
private val reactions: EmojiReactionRepository,
private val cursorToMessage: CursorToMessage,
private val cursorToPart: CursorToPart,
) : MessageRepository {
@@ -93,6 +95,7 @@ open class MessageRepositoryImpl @Inject constructor(
Realm.getDefaultInstance()
.where(Message::class.java)
.equalTo("threadId", threadId)
.equalTo("isEmojiReaction", false)
.let {
when (query.isEmpty()) {
true -> it
@@ -188,9 +191,10 @@ open class MessageRepositoryImpl @Inject constructor(
val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(part.type)
?: return null
val date = part.messages?.first()?.date
val fileName = part.name?.takeIf { name -> name.endsWith(extension) }
?: "${part.type.split("/").last()}_$date.$extension"
// fileDateAndTime is divided by 1000 in order to remove the extra 0's after date and time
// This way the file name isn't so long.
val fileDateAndTime = (part.messages?.first()?.date)?.div(1000)
val fileName = "QUIK_${part.type.split("/").last()}_$fileDateAndTime.$extension"
val values = contentValuesOf(
MediaStore.MediaColumns.DISPLAY_NAME to fileName,
@@ -731,7 +735,33 @@ open class MessageRepositoryImpl @Inject constructor(
}
Realm.getDefaultInstance().use { realm ->
realm.executeTransaction { realm.copyToRealmOrUpdate(message) }
var managedMessage: Message? = null
realm.executeTransaction { managedMessage = realm.copyToRealmOrUpdate(message) }
context.contentResolver.insert(Sms.Inbox.CONTENT_URI, values)
?.lastPathSegment?.toLong()?.let { id ->
// Update contentId after the message has been inserted to the content provider
realm.executeTransaction { managedMessage?.contentId = id }
}
managedMessage?.let { savedMessage ->
val parsedReaction = reactions.parseEmojiReaction(body)
if (parsedReaction != null) {
val targetMessage = reactions.findTargetMessage(
savedMessage.threadId,
parsedReaction.originalMessage,
realm
)
realm.executeTransaction {
reactions.saveEmojiReaction(
savedMessage,
parsedReaction,
targetMessage,
realm,
)
}
}
}
}
return message
@@ -8,6 +8,7 @@ import io.reactivex.schedulers.Schedulers
import io.realm.Realm
import io.realm.RealmList
import io.realm.RealmResults
import timber.log.Timber
import javax.inject.Inject
class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRepository {
@@ -20,7 +21,8 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep
recipients: List<String>,
sendAsGroup: Boolean,
body: String,
attachments: List<String>
attachments: List<String>,
conversationId: Long
): ScheduledMessage {
Realm.getDefaultInstance().use { realm ->
val id = (realm
@@ -33,7 +35,7 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep
val attachmentsRealmList = RealmList(*attachments.toTypedArray())
val message = ScheduledMessage(id, date, subId, recipientsRealmList, sendAsGroup, body,
attachmentsRealmList)
attachmentsRealmList, conversationId)
realm.executeTransaction { realm.insertOrUpdate(message) }
@@ -62,6 +64,13 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep
.findFirst()
}
override fun getScheduledMessagesForConversation(conversationId: Long): RealmResults<ScheduledMessage> {
return Realm.getDefaultInstance()
.where(ScheduledMessage::class.java)
.equalTo("conversationId", conversationId)
.findAllAsync()
}
override fun deleteScheduledMessage(id: Long) {
val subscription = Completable.fromAction {
Realm.getDefaultInstance().use { realm ->
@@ -71,12 +80,12 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep
realm.executeTransaction { message?.deleteFromRealm() }
}
}.subscribeOn(Schedulers.io()) // Perform the operation in a background thread
.observeOn(AndroidSchedulers.mainThread()) // Switch back to the main thread if needed
}.subscribeOn(Schedulers.io()) // Run on a background thread and switch to main if needed
.observeOn(AndroidSchedulers.mainThread())
.subscribe({
// Handle completion, e.g., log success or update UI
Timber.v("Successfully deleted scheduled messages.")
}, {
// Handle error, e.g., log or show error message
Timber.e("Deleting scheduled messages failed.")
})
disposables.add(subscription)
@@ -96,5 +105,4 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep
.map { it.id }
}
}
}
@@ -21,6 +21,8 @@ package dev.octoshrimpy.quik.repository
import android.content.ContentResolver
import android.content.ContentUris
import android.net.Uri
import android.os.Handler
import android.os.HandlerThread
import android.provider.Telephony
import com.f2prateek.rx.preferences2.RxSharedPreferences
import dev.octoshrimpy.quik.extensions.forEach
@@ -37,6 +39,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
@@ -49,6 +52,7 @@ import io.reactivex.subjects.Subject
import io.realm.Realm
import io.realm.RealmList
import io.realm.Sort
import timber.log.Timber
import javax.inject.Inject
import javax.inject.Singleton
@@ -65,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<SyncRepository.SyncProgress> =
@@ -73,144 +78,173 @@ class SyncRepositoryImpl @Inject constructor(
override fun syncMessages() {
val oldBlockedSenders = rxPrefs.getStringSet("pref_key_blocked_senders")
// If the sync is already running, don't try to do another one
if (syncProgress.blockingFirst() is SyncRepository.SyncProgress.Running) return
syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true))
val realm = Realm.getDefaultInstance()
realm.beginTransaction()
val handlerThread = HandlerThread("RealmSyncThread")
handlerThread.start()
Handler(handlerThread.looper).post {
Realm.getDefaultInstance().executeTransactionAsync(
{ realm ->
// Prepare existing conversation data
val persistedData = realm.copyFromRealm(
realm.where(Conversation::class.java)
.beginGroup()
.equalTo("archived", true)
.or()
.equalTo("blocked", true)
.or()
.equalTo("pinned", true)
.or()
.isNotEmpty("name")
.or()
.isNotNull("blockingClient")
.or()
.isNotEmpty("blockReason")
.endGroup()
.findAll()
).associateBy { conversation -> conversation.id }.toMutableMap()
val persistedData = realm.copyFromRealm(realm.where(Conversation::class.java)
.beginGroup()
.equalTo("archived", true)
.or()
.equalTo("blocked", true)
.or()
.equalTo("pinned", true)
.or()
.isNotEmpty("name")
.or()
.isNotNull("blockingClient")
.or()
.isNotEmpty("blockReason")
.endGroup()
.findAll())
.associateBy { conversation -> conversation.id }
.toMutableMap()
removeOldMessages(realm)
realm.delete(Contact::class.java)
realm.delete(ContactGroup::class.java)
realm.delete(Conversation::class.java)
realm.delete(Message::class.java)
realm.delete(MmsPart::class.java)
realm.delete(Recipient::class.java)
keys.reset()
keys.reset()
val partsCursor = cursorToPart.getPartsCursor()
val messageCursor = cursorToMessage.getMessagesCursor()
val conversationCursor = cursorToConversation.getConversationsCursor()
val recipientCursor = cursorToRecipient.getRecipientCursor()
val partsCursor = cursorToPart.getPartsCursor()
val messageCursor = cursorToMessage.getMessagesCursor()
val conversationCursor = cursorToConversation.getConversationsCursor()
val recipientCursor = cursorToRecipient.getRecipientCursor()
val max = (partsCursor?.count ?: 0) +
(messageCursor?.count ?: 0) +
(conversationCursor?.count ?: 0) +
(recipientCursor?.count ?: 0)
val max = (partsCursor?.count ?: 0) +
(messageCursor?.count ?: 0) +
(conversationCursor?.count ?: 0) +
(recipientCursor?.count ?: 0)
var progress = 0
var progress = 0
// Sync message parts
partsCursor?.use {
partsCursor.forEach {
tryOrNull {
progress++
val part = cursorToPart.map(partsCursor)
realm.insertOrUpdate(part)
// Sync message parts
partsCursor?.use {
partsCursor.forEach { cursor ->
tryOrNull {
val part = cursorToPart.map(partsCursor)
realm.insertOrUpdate(part)
progress++
}
}
}
}
}
// Sync messages
messageCursor?.use {
val messageColumns = CursorToMessage.MessageColumns(messageCursor)
messageCursor.forEach { cursor ->
tryOrNull {
progress++
syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false))
val message = cursorToMessage.map(Pair(cursor, messageColumns)).apply {
if (isMms()) {
parts = RealmList<MmsPart>().apply {
addAll(realm.where(MmsPart::class.java)
.equalTo("messageId", contentId)
.findAll())
// Sync messages
messageCursor?.use {
val messageColumns = CursorToMessage.MessageColumns(messageCursor)
messageCursor.forEach { cursor ->
tryOrNull {
syncProgress.onNext(
SyncRepository.SyncProgress.Running(
max,
++progress,
false
)
)
val message = cursorToMessage.map(Pair(cursor, messageColumns)).apply {
if (isMms()) {
parts = RealmList<MmsPart>().apply {
addAll(
realm.where(MmsPart::class.java)
.equalTo("messageId", contentId)
.findAll()
)
}
}
}
realm.insertOrUpdate(message)
}
}
realm.insertOrUpdate(message)
}
}
}
// Migrate blocked conversations from 2.7.3
val oldBlockedSenders = rxPrefs.getStringSet("pref_key_blocked_senders")
oldBlockedSenders.get()
.map { threadIdString -> threadIdString.toLong() }
.filter { threadId -> !persistedData.contains(threadId) }
.forEach { threadId -> persistedData[threadId] = Conversation(id = threadId, blocked = true) }
// Sync conversations
conversationCursor?.use {
conversationCursor.forEach { cursor ->
tryOrNull {
progress++
syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false))
val conversation = cursorToConversation.map(cursor).apply {
persistedData[id]?.let { persistedConversation ->
archived = persistedConversation.archived
blocked = persistedConversation.blocked
pinned = persistedConversation.pinned
name = persistedConversation.name
blockingClient = persistedConversation.blockingClient
blockReason = persistedConversation.blockReason
}
lastMessage = realm.where(Message::class.java)
.sort("date", Sort.DESCENDING)
.equalTo("threadId", id)
.findFirst()
// Migrate blocked conversations from 2.7.3
oldBlockedSenders.get()
.map { threadIdString -> threadIdString.toLong() }
.filter { threadId -> !persistedData.contains(threadId) }
.forEach { threadId ->
persistedData[threadId] = Conversation(id = threadId, blocked = true)
}
realm.insertOrUpdate(conversation)
}
}
}
// Sync recipients
recipientCursor?.use {
val contacts = realm.copyToRealmOrUpdate(getContacts())
recipientCursor.forEach { cursor ->
tryOrNull {
progress++
syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false))
val recipient = cursorToRecipient.map(cursor).apply {
contact = contacts.firstOrNull { contact ->
contact.numbers.any { phoneNumberUtils.compare(address, it.address) }
// Sync conversations
conversationCursor?.use {
conversationCursor.forEach { cursor ->
tryOrNull {
syncProgress.onNext(
SyncRepository.SyncProgress.Running(
max,
++progress,
false
)
)
val conversation = cursorToConversation.map(cursor).apply {
persistedData[id]?.let { persistedConversation ->
archived = persistedConversation.archived
blocked = persistedConversation.blocked
pinned = persistedConversation.pinned
name = persistedConversation.name
blockingClient = persistedConversation.blockingClient
blockReason = persistedConversation.blockReason
}
lastMessage = realm.where(Message::class.java)
.sort("date", Sort.DESCENDING)
.equalTo("threadId", id)
.findFirst()
}
realm.insertOrUpdate(conversation)
}
}
realm.insertOrUpdate(recipient)
}
}
// Sync recipients
val contacts = realm.copyToRealmOrUpdate(getContacts())
recipientCursor?.use {
recipientCursor.forEach { cursor ->
tryOrNull {
syncProgress.onNext(
SyncRepository.SyncProgress.Running(
max,
++progress,
false
)
)
val rec = cursorToRecipient.map(cursor).apply {
contact = contacts.firstOrNull { c ->
c.numbers.any { num ->
phoneNumberUtils.compare(
address,
num.address
)
}
}
}
realm.insertOrUpdate(rec)
}
}
}
syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true))
// Now that we have all the messages, we can scan for emoji reactions
reactions.deleteAndReparseAllEmojiReactions(realm)
realm.insert(SyncLog())
}, {
handlerThread.quitSafely()
oldBlockedSenders.delete()
syncProgress.onNext(SyncRepository.SyncProgress.Idle)
},
{ error ->
handlerThread.quitSafely()
Timber.e(error, "syncMessages Failed")
syncProgress.onNext(SyncRepository.SyncProgress.Idle)
})
}
syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true))
realm.insert(SyncLog())
realm.commitTransaction()
realm.close()
// Only delete this after the sync has successfully completed
oldBlockedSenders.delete()
syncProgress.onNext(SyncRepository.SyncProgress.Idle)
}
override fun syncMessage(uri: Uri, messageId: Long): Message? {
@@ -265,6 +299,26 @@ class SyncRepositoryImpl @Inject constructor(
conversationRepo.getOrCreateConversation(threadId)
insertOrUpdate()
val text = getText(false)
val parsedReaction = reactions.parseEmojiReaction(text)
if (parsedReaction != null) {
Realm.getDefaultInstance().use { realm ->
val targetMessage = reactions.findTargetMessage(
threadId,
parsedReaction.originalMessage,
realm
)
realm.executeTransaction {
reactions.saveEmojiReaction(
this,
parsedReaction,
targetMessage,
realm,
)
}
}
}
}
}
}
@@ -351,4 +405,13 @@ class SyncRepositoryImpl @Inject constructor(
return groups
}
private fun removeOldMessages(realm: Realm) {
realm.delete(Contact::class.java)
realm.delete(ContactGroup::class.java)
realm.delete(Conversation::class.java)
realm.delete(Message::class.java)
realm.delete(MmsPart::class.java)
realm.delete(Recipient::class.java)
}
}
@@ -6,9 +6,9 @@ import android.app.job.JobParameters
import android.app.job.JobService
import android.content.ComponentName
import android.content.Context
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.common.util.extensions.jobScheduler
import dev.octoshrimpy.quik.interactor.DeleteOldMessages
import dagger.android.AndroidInjection
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import timber.log.Timber
@@ -22,9 +22,9 @@ import android.app.IntentService
import android.content.Intent
import android.net.Uri
import android.telephony.TelephonyManager
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.interactor.SendNewMessage
import dev.octoshrimpy.quik.repository.ConversationRepository
import dagger.android.AndroidInjection
import javax.inject.Inject
class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") {
@@ -0,0 +1,28 @@
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_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? = null,
@Json(name = "emoji_reaction_ios_heart_removed") val iosHeartRemoved: String? = null,
@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? = null,
@Json(name = "emoji_reaction_ios_dislike_removed") val iosDislikeRemoved: String? = null,
@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? = null,
@Json(name = "emoji_reaction_ios_exclamation_removed") val iosExclamationRemoved: String? = null,
@Json(name = "emoji_reaction_ios_question_mark_added") val iosQuestionMarkAdded: String? = null,
@Json(name = "emoji_reaction_ios_question_mark_removed") val iosQuestionMarkRemoved: String? = null,
)
@@ -26,7 +26,8 @@ import androidx.appcompat.app.AppCompatDelegate
import dev.octoshrimpy.quik.manager.WidgetManager
import dev.octoshrimpy.quik.receiver.NightModeReceiver
import java.text.SimpleDateFormat
import java.util.*
import java.util.Calendar
import java.util.Locale
import java.util.concurrent.TimeUnit
import javax.inject.Inject
import javax.inject.Singleton
@@ -22,7 +22,7 @@ import android.content.Context
import android.telephony.PhoneNumberUtils
import io.michaelrocks.libphonenumber.android.PhoneNumberUtil
import io.michaelrocks.libphonenumber.android.Phonenumber
import java.util.*
import java.util.Locale
import javax.inject.Inject
import javax.inject.Singleton
@@ -39,12 +39,14 @@ class PhoneNumberUtils @Inject constructor(context: Context) {
* This method will run successfully stricter checks without compromising much speed
*/
fun compare(first: String, second: String): Boolean {
if (first.equals(second, true)) {
val normalizedFirst = normalizeNumber(first)
val normalizedSecond = normalizeNumber(second)
if (normalizedFirst.equals(normalizedSecond, true)) {
return true
}
if (PhoneNumberUtils.compare(first, second)) {
val matchType = phoneNumberUtil.isNumberMatch(first, second)
val matchType = phoneNumberUtil.isNumberMatch(normalizedFirst, normalizedSecond)
if (matchType >= PhoneNumberUtil.MatchType.SHORT_NSN_MATCH) {
return true
}