diff --git a/data/src/main/java/com/moez/QKSMS/worker/InjectionWorkerFactory.kt b/data/src/main/java/com/moez/QKSMS/worker/InjectionWorkerFactory.kt index 7fd5667e..48e09792 100644 --- a/data/src/main/java/com/moez/QKSMS/worker/InjectionWorkerFactory.kt +++ b/data/src/main/java/com/moez/QKSMS/worker/InjectionWorkerFactory.kt @@ -28,7 +28,9 @@ import dev.octoshrimpy.quik.interactor.UpdateBadge import dev.octoshrimpy.quik.manager.ActiveConversationManager import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.manager.ShortcutManager +import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ConversationRepository +import dev.octoshrimpy.quik.repository.MessageContentFilterRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import dev.octoshrimpy.quik.repository.SyncRepository @@ -46,6 +48,8 @@ class InjectionWorkerFactory @Inject constructor( private val notificationManager: NotificationManager, private val activeConversationManager: ActiveConversationManager, private val syncRepo: SyncRepository, + private val filterRepo: MessageContentFilterRepository, + private val contactRepo: ContactRepository, ) : WorkerFactory() { override fun createWorker( @@ -70,6 +74,8 @@ class InjectionWorkerFactory @Inject constructor( instance.shortcutManager = shortcutManager instance.notificationManager = notificationManager instance.updateBadge = updateBadge + instance.filterRepo = filterRepo + instance.contactsRepo = contactRepo } is ReceiveMmsWorker -> { instance.syncRepo = syncRepo @@ -81,6 +87,8 @@ class InjectionWorkerFactory @Inject constructor( instance.shortcutManager = shortcutManager instance.notificationManager = notificationManager instance.updateBadge = updateBadge + instance.filterRepo = filterRepo + instance.contactsRepo = contactRepo } } diff --git a/data/src/main/java/com/moez/QKSMS/worker/ReceiveMmsWorker.kt b/data/src/main/java/com/moez/QKSMS/worker/ReceiveMmsWorker.kt index 2d227d76..0c1a15c1 100644 --- a/data/src/main/java/com/moez/QKSMS/worker/ReceiveMmsWorker.kt +++ b/data/src/main/java/com/moez/QKSMS/worker/ReceiveMmsWorker.kt @@ -49,7 +49,9 @@ import dev.octoshrimpy.quik.manager.ActiveConversationManager import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.manager.ShortcutManager import dev.octoshrimpy.quik.receiver.MessageSentReceiver +import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ConversationRepository +import dev.octoshrimpy.quik.repository.MessageContentFilterRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.util.Preferences @@ -84,6 +86,8 @@ class ReceiveMmsWorker(appContext: Context, workerParams: WorkerParameters) @Inject lateinit var notificationManager: NotificationManager @Inject lateinit var updateBadge: UpdateBadge @Inject lateinit var shortcutManager: ShortcutManager + @Inject lateinit var filterRepo: MessageContentFilterRepository + @Inject lateinit var contactsRepo: ContactRepository override fun doWork(): Result { Timber.v("started") @@ -183,6 +187,13 @@ class ReceiveMmsWorker(appContext: Context, workerParams: WorkerParameters) else -> Unit } + val messageFilterAction = filterRepo.isBlocked(message.getText(), message.address, contactsRepo) + if (messageFilterAction) { + Timber.v("message dropped based on content filters") + messageRepo.deleteMessages(listOf(message.id)) + return Result.failure(inputData) + } + // update the conversation conversationRepo.updateConversations(listOf(message.threadId)) val conversation = diff --git a/data/src/main/java/com/moez/QKSMS/worker/ReceiveSmsWorker.kt b/data/src/main/java/com/moez/QKSMS/worker/ReceiveSmsWorker.kt index c246b2f7..28280255 100644 --- a/data/src/main/java/com/moez/QKSMS/worker/ReceiveSmsWorker.kt +++ b/data/src/main/java/com/moez/QKSMS/worker/ReceiveSmsWorker.kt @@ -26,7 +26,9 @@ import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.interactor.UpdateBadge import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.manager.ShortcutManager +import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ConversationRepository +import dev.octoshrimpy.quik.repository.MessageContentFilterRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.util.Preferences import timber.log.Timber @@ -45,6 +47,8 @@ class ReceiveSmsWorker(appContext: Context, workerParams: WorkerParameters) @Inject lateinit var notificationManager: NotificationManager @Inject lateinit var updateBadge: UpdateBadge @Inject lateinit var shortcutManager: ShortcutManager + @Inject lateinit var filterRepo: MessageContentFilterRepository + @Inject lateinit var contactsRepo: ContactRepository override fun doWork(): Result { Timber.v("started") @@ -85,6 +89,13 @@ class ReceiveSmsWorker(appContext: Context, workerParams: WorkerParameters) } } + val messageFilterAction = filterRepo.isBlocked(message.getText(), message.address, contactsRepo) + if (messageFilterAction) { + Timber.v("message dropped based on content filters") + messageRepo.deleteMessages(listOf(message.id)) + return Result.failure(inputData) + } + // update and fetch conversation conversationRepo.updateConversations(listOf(message.threadId)) val conversation = conversationRepo.getOrCreateConversation(message.threadId)