From 96ba5ffd441a74fafffe19b2f298aba429fe68d4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 28 Dec 2017 15:02:09 -0500 Subject: [PATCH] Fix message syncing when sending new messages --- .../java/com/moez/QKSMS/data/repository/MessageRepository.kt | 3 ++- .../main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index cff72f0e..8976c771 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -321,7 +321,8 @@ class MessageRepository @Inject constructor( Flowable.just(values) .subscribeOn(Schedulers.io()) .map { contentResolver.update(uri, values, null, null) } - .subscribe { addMessageFromUri(uri) } + .flatMap { addMessageFromUri(uri) } + .subscribe() } fun addMessageFromUri(uri: Uri): Flowable { diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt index b038a2f3..fda9cbf5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt @@ -55,7 +55,7 @@ class SendMessage @Inject constructor( .flatMap { bodies -> bodies.toFlowable() } .map { bodies -> createContentValues(params.threadId, params.address, bodies) } .map { values -> Pair(values, contentResolver.insert(Telephony.Sms.CONTENT_URI, values)) } - .doOnNext { (_, uri) -> messageRepo.addMessageFromUri(uri) } + .doOnNext { (_, uri) -> messageRepo.addMessageFromUri(uri).blockingSubscribe() } .map { (values, uri) -> val sentIntent = Intent(context, MessageSentReceiver::class.java).putExtra("uri", uri.toString()) val sentPI = PendingIntent.getBroadcast(context, uri.lastPathSegment.toInt(), sentIntent, PendingIntent.FLAG_UPDATE_CURRENT)