From 5d2b59e57a479ba3f5882ec1c9ed736fe75f3d07 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Sat, 9 Nov 2019 03:45:49 -0500 Subject: [PATCH] Update badge and shortcuts after pinning --- .../main/java/com/moez/QKSMS/interactor/MarkPinned.kt | 11 +++++++++-- .../java/com/moez/QKSMS/interactor/MarkUnpinned.kt | 11 +++++++++-- .../main/java/com/moez/QKSMS/interactor/ReceiveSms.kt | 4 ++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkPinned.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkPinned.kt index c5093616..781d65a6 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkPinned.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkPinned.kt @@ -18,15 +18,22 @@ */ package com.moez.QKSMS.interactor +import com.moez.QKSMS.manager.ShortcutManager import com.moez.QKSMS.repository.ConversationRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkPinned @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() { +class MarkPinned @Inject constructor( + private val conversationRepo: ConversationRepository, + private val updateBadge: UpdateBadge, + private val shortcutManager: ShortcutManager +) : Interactor>() { override fun buildObservable(params: List): Flowable<*> { return Flowable.just(params.toLongArray()) .doOnNext { threadIds -> conversationRepo.markPinned(*threadIds) } + .doOnNext { shortcutManager.updateShortcuts() } // Update shortcuts + .flatMap { updateBadge.buildObservable(Unit) } // Update the badge and widget } -} \ No newline at end of file +} diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnpinned.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnpinned.kt index e8501495..2cbb5e7b 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnpinned.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnpinned.kt @@ -18,15 +18,22 @@ */ package com.moez.QKSMS.interactor +import com.moez.QKSMS.manager.ShortcutManager import com.moez.QKSMS.repository.ConversationRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkUnpinned @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() { +class MarkUnpinned @Inject constructor( + private val conversationRepo: ConversationRepository, + private val updateBadge: UpdateBadge, + private val shortcutManager: ShortcutManager +) : Interactor>() { override fun buildObservable(params: List): Flowable<*> { return Flowable.just(params.toLongArray()) .doOnNext { threadIds -> conversationRepo.markUnpinned(*threadIds) } + .doOnNext { shortcutManager.updateShortcuts() } // Update shortcuts + .flatMap { updateBadge.buildObservable(Unit) } // Update the badge and widget } -} \ No newline at end of file +} diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt index 6c8254c8..f2b4c6d3 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt @@ -91,7 +91,7 @@ class ReceiveSms @Inject constructor( .map { conversation -> conversation.id } // Map to the id because [delay] will put us on the wrong thread .doOnNext { threadId -> notificationManager.update(threadId) } // Update the notification .doOnNext { shortcutManager.updateShortcuts() } // Update shortcuts - .flatMap { updateBadge.buildObservable(Unit) } // Update the badge + .flatMap { updateBadge.buildObservable(Unit) } // Update the badge and widget } -} \ No newline at end of file +}