forked from upstream-mirrors/quik
#1202 - Update badge after sync
This commit is contained in:
@@ -20,7 +20,6 @@ package interactor
|
|||||||
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import io.reactivex.Flowable
|
import io.reactivex.Flowable
|
||||||
import model.Message
|
|
||||||
import repository.ConversationRepository
|
import repository.ConversationRepository
|
||||||
import repository.SyncRepository
|
import repository.SyncRepository
|
||||||
import util.extensions.mapNotNull
|
import util.extensions.mapNotNull
|
||||||
@@ -28,13 +27,15 @@ import javax.inject.Inject
|
|||||||
|
|
||||||
class SyncMessage @Inject constructor(
|
class SyncMessage @Inject constructor(
|
||||||
private val conversationRepo: ConversationRepository,
|
private val conversationRepo: ConversationRepository,
|
||||||
private val syncManager: SyncRepository
|
private val syncManager: SyncRepository,
|
||||||
|
private val updateBadge: UpdateBadge
|
||||||
) : Interactor<Uri>() {
|
) : Interactor<Uri>() {
|
||||||
|
|
||||||
override fun buildObservable(params: Uri): Flowable<Message> {
|
override fun buildObservable(params: Uri): Flowable<*> {
|
||||||
return Flowable.just(params)
|
return Flowable.just(params)
|
||||||
.mapNotNull { uri -> syncManager.syncMessage(uri) }
|
.mapNotNull { uri -> syncManager.syncMessage(uri) }
|
||||||
.doOnNext { message -> conversationRepo.updateConversations(message.threadId) }
|
.doOnNext { message -> conversationRepo.updateConversations(message.threadId) }
|
||||||
|
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -25,15 +25,17 @@ import java.util.concurrent.TimeUnit
|
|||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class SyncMessages @Inject constructor(
|
class SyncMessages @Inject constructor(
|
||||||
private val syncManager: SyncRepository
|
private val syncManager: SyncRepository,
|
||||||
|
private val updateBadge: UpdateBadge
|
||||||
) : Interactor<Unit>() {
|
) : Interactor<Unit>() {
|
||||||
|
|
||||||
override fun buildObservable(params: Unit): Flowable<Long> {
|
override fun buildObservable(params: Unit): Flowable<*> {
|
||||||
return Flowable.just(System.currentTimeMillis())
|
return Flowable.just(System.currentTimeMillis())
|
||||||
.doOnNext { syncManager.syncMessages() }
|
.doOnNext { syncManager.syncMessages() }
|
||||||
.map { startTime -> System.currentTimeMillis() - startTime }
|
.map { startTime -> System.currentTimeMillis() - startTime }
|
||||||
.map { elapsed -> TimeUnit.MILLISECONDS.toSeconds(elapsed) }
|
.map { elapsed -> TimeUnit.MILLISECONDS.toSeconds(elapsed) }
|
||||||
.doOnNext { seconds -> Timber.v("Completed sync in $seconds seconds") }
|
.doOnNext { seconds -> Timber.v("Completed sync in $seconds seconds") }
|
||||||
|
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user