From ddb8bb025fc4d54593bb68e44ae9054aa710a57c Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 20 Jun 2018 00:09:19 -0400 Subject: [PATCH] #1202 - Update badge after sync --- domain/src/main/java/interactor/SyncMessage.kt | 7 ++++--- domain/src/main/java/interactor/SyncMessages.kt | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/domain/src/main/java/interactor/SyncMessage.kt b/domain/src/main/java/interactor/SyncMessage.kt index 57804a1b..cacf2788 100644 --- a/domain/src/main/java/interactor/SyncMessage.kt +++ b/domain/src/main/java/interactor/SyncMessage.kt @@ -20,7 +20,6 @@ package interactor import android.net.Uri import io.reactivex.Flowable -import model.Message import repository.ConversationRepository import repository.SyncRepository import util.extensions.mapNotNull @@ -28,13 +27,15 @@ import javax.inject.Inject class SyncMessage @Inject constructor( private val conversationRepo: ConversationRepository, - private val syncManager: SyncRepository + private val syncManager: SyncRepository, + private val updateBadge: UpdateBadge ) : Interactor() { - override fun buildObservable(params: Uri): Flowable { + override fun buildObservable(params: Uri): Flowable<*> { return Flowable.just(params) .mapNotNull { uri -> syncManager.syncMessage(uri) } .doOnNext { message -> conversationRepo.updateConversations(message.threadId) } + .flatMap { updateBadge.buildObservable(Unit) } // Update the badge } } \ No newline at end of file diff --git a/domain/src/main/java/interactor/SyncMessages.kt b/domain/src/main/java/interactor/SyncMessages.kt index 2f2b3a27..968383ae 100644 --- a/domain/src/main/java/interactor/SyncMessages.kt +++ b/domain/src/main/java/interactor/SyncMessages.kt @@ -25,15 +25,17 @@ import java.util.concurrent.TimeUnit import javax.inject.Inject class SyncMessages @Inject constructor( - private val syncManager: SyncRepository + private val syncManager: SyncRepository, + private val updateBadge: UpdateBadge ) : Interactor() { - override fun buildObservable(params: Unit): Flowable { + override fun buildObservable(params: Unit): Flowable<*> { return Flowable.just(System.currentTimeMillis()) .doOnNext { syncManager.syncMessages() } .map { startTime -> System.currentTimeMillis() - startTime } .map { elapsed -> TimeUnit.MILLISECONDS.toSeconds(elapsed) } .doOnNext { seconds -> Timber.v("Completed sync in $seconds seconds") } + .flatMap { updateBadge.buildObservable(Unit) } // Update the badge } } \ No newline at end of file