From 021fab57ca6eddd76d76c6da90a5d5c04c6bf431 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Sun, 8 Sep 2019 21:58:26 -0400 Subject: [PATCH] #1488 - Mark incoming blocked messages as read --- domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt | 5 ++++- domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt index 0ec339212..2f53ce5bd 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt @@ -67,7 +67,10 @@ class ReceiveMms @Inject constructor( } when (action) { - BlockingClient.Action.BLOCK -> conversationRepo.markBlocked(message.threadId) + BlockingClient.Action.BLOCK -> { + messageRepo.markRead(message.threadId) + conversationRepo.markBlocked(message.threadId) + } BlockingClient.Action.UNBLOCK -> conversationRepo.markUnblocked(message.threadId) else -> Unit } diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt index c15b26675..5ca38e64e 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt @@ -67,7 +67,10 @@ class ReceiveSms @Inject constructor( val message = messageRepo.insertReceivedSms(it.subId, address, body, time) when (action) { - BlockingClient.Action.BLOCK -> conversationRepo.markBlocked(message.threadId) + BlockingClient.Action.BLOCK -> { + messageRepo.markRead(message.threadId) + conversationRepo.markBlocked(message.threadId) + } BlockingClient.Action.UNBLOCK -> conversationRepo.markUnblocked(message.threadId) else -> Unit }