Move conversation from archive in ReceiveMessage instead of NotificationManager

This commit is contained in:
Moez Bhatti
2017-12-28 03:03:55 -05:00
parent 43bd7db1d1
commit a980803559
2 changed files with 8 additions and 10 deletions
@@ -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())
@@ -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 { }
}
}