From a9808035596c632b4e26434e15af27ab75cee6d0 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 28 Dec 2017 03:03:55 -0500 Subject: [PATCH] Move conversation from archive in ReceiveMessage instead of NotificationManager --- .../moez/QKSMS/common/util/NotificationManager.kt | 6 +----- .../moez/QKSMS/domain/interactor/ReceiveMessage.kt | 12 +++++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt index f7df1956..59960ef1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt @@ -94,10 +94,6 @@ class NotificationManager @Inject constructor( val conversation = messageRepo.getConversation(threadId) ?: return - if (conversation.archived) { - markUnarchived.execute(threadId) - } - val style = NotificationCompat.MessagingStyle("Me") messages.forEach { message -> val name = if (message.isMe()) null else conversation.getTitle() @@ -129,7 +125,7 @@ class NotificationManager @Inject constructor( .setVibrate(if (prefs.vibration.get()) VIBRATE_PATTERN else longArrayOf(0)) if (Build.VERSION.SDK_INT >= 24) { - notification.addAction(getReplyAction(conversation.recipients[0]?.address.orEmpty(), conversation.id)) + notification.addAction(getReplyAction(conversation.recipients[0]?.address.orEmpty(), threadId)) } notificationManager.notify(threadId.toInt(), notification.build()) diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt index 7458b1ef..7b9256a1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt @@ -22,6 +22,7 @@ import android.content.ContentValues import android.content.Context import android.provider.Telephony import com.moez.QKSMS.common.util.NotificationManager +import com.moez.QKSMS.common.util.extensions.mapNotNull import com.moez.QKSMS.data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject @@ -44,11 +45,12 @@ class ReceiveMessage @Inject constructor( val contentResolver = context.contentResolver return Flowable.just(values) - .map { contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) } - .flatMap { uri -> messageRepo.addMessageFromUri(uri) } - .map { message -> message.threadId } - .doOnNext { threadId -> notificationManager.update(threadId) } - .map { Unit } + .map { contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) } // Add the message to the db + .flatMap { uri -> messageRepo.addMessageFromUri(uri) } // Copy message from realm to db + .mapNotNull { message -> messageRepo.getConversation(message.threadId) } // Map message to conversation + .doOnNext { conversation -> if (conversation.archived) messageRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary + .doOnNext { conversation -> notificationManager.update(conversation.id) } // Update the notification + .map { } } } \ No newline at end of file