From 03af81336cdc0a92c7f659d95c0f4cd524e214f6 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Fri, 30 Aug 2019 01:44:06 +0200 Subject: [PATCH] Offer to migrate blocked numbers --- .../repository/ConversationRepositoryImpl.kt | 7 +++++ .../repository/ConversationRepository.kt | 2 ++ .../manager/BlockingManagerController.kt | 12 +++++++ .../manager/BlockingManagerPresenter.kt | 31 +++++++++++++++++++ .../blocking/manager/BlockingManagerView.kt | 2 ++ .../messages/BlockedMessagesPresenter.kt | 2 +- presentation/src/main/res/values/strings.xml | 2 ++ 7 files changed, 57 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt index 2b6148e8..6d98a4fe 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt @@ -121,6 +121,13 @@ class ConversationRepositoryImpl @Inject constructor( } override fun getBlockedConversations(): RealmResults { + return Realm.getDefaultInstance() + .where(Conversation::class.java) + .equalTo("blocked", true) + .findAll() + } + + override fun getBlockedConversationsAsync(): RealmResults { return Realm.getDefaultInstance() .where(Conversation::class.java) .equalTo("blocked", true) diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt index d7dc1f80..f28ba268 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt @@ -39,6 +39,8 @@ interface ConversationRepository { fun getBlockedConversations(): RealmResults + fun getBlockedConversationsAsync(): RealmResults + fun getConversationAsync(threadId: Long): Conversation fun getConversation(threadId: Long): Conversation? diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerController.kt index 01f09cbc..96e647e8 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerController.kt @@ -1,6 +1,7 @@ package com.moez.QKSMS.feature.blocking.manager import android.app.Activity +import android.app.AlertDialog import android.view.View import com.bluelinelabs.conductor.RouterTransaction import com.jakewharton.rxbinding2.view.clicks @@ -11,6 +12,7 @@ import com.moez.QKSMS.feature.blocking.numbers.BlockedNumbersController import com.moez.QKSMS.injection.appComponent import com.moez.QKSMS.util.Preferences import io.reactivex.Observable +import io.reactivex.Single import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.blocking_manager_controller.* import kotlinx.android.synthetic.main.blocking_manager_list_option.view.* @@ -65,6 +67,16 @@ class BlockingManagerController : QkController = shouldIAnswer.clicks() override fun launchSiaClicked(): Observable<*> = shouldIAnswer.launch.clicks() + override fun showCopyDialog(manager: String): Single = Single.create { emitter -> + AlertDialog.Builder(activity) + .setTitle(R.string.blocking_manager_copy_title) + .setMessage(resources?.getString(R.string.blocking_manager_copy_summary, manager)) + .setPositiveButton(R.string.button_continue) { _, _ -> emitter.onSuccess(true) } + .setNegativeButton(R.string.button_cancel) { _, _ -> emitter.onSuccess(false) } + .setCancelable(false) + .show() + } + override fun openBlockedNumbers() { router.pushController(RouterTransaction.with(BlockedNumbersController()) .pushChangeHandler(QkChangeHandler()) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt index 9eef23e1..1cd19e00 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt @@ -1,20 +1,29 @@ package com.moez.QKSMS.feature.blocking.manager +import android.content.Context +import com.moez.QKSMS.R +import com.moez.QKSMS.blocking.BlockingClient import com.moez.QKSMS.blocking.CallControlBlockingClient import com.moez.QKSMS.blocking.QksmsBlockingClient import com.moez.QKSMS.blocking.ShouldIAnswerBlockingClient import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.manager.AnalyticsManager +import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.util.Preferences import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable +import io.reactivex.Observable +import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign +import io.reactivex.schedulers.Schedulers import javax.inject.Inject class BlockingManagerPresenter @Inject constructor( private val analytics: AnalyticsManager, private val callControl: CallControlBlockingClient, + private val context: Context, + private val conversationRepo: ConversationRepository, private val navigator: Navigator, private val prefs: Preferences, private val qksms: QksmsBlockingClient, @@ -46,6 +55,9 @@ class BlockingManagerPresenter @Inject constructor( .subscribe { available -> newState { copy(siaInstalled = available) } } view.qksmsClicked() + .observeOn(Schedulers.io()) + .map { getAddressesToBlock(qksms) } + .switchMap { numbers -> qksms.block(numbers).andThen(Observable.just(Unit)) } // Hack .autoDisposable(view.scope()) .subscribe { analytics.setUserProperty("Blocking Manager", "QKSMS") @@ -70,6 +82,21 @@ class BlockingManagerPresenter @Inject constructor( val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_CC installed && !enabled } + .observeOn(Schedulers.io()) + .map { getAddressesToBlock(callControl) } + .observeOn(AndroidSchedulers.mainThread()) + .switchMap { numbers -> + when (numbers.size) { + 0 -> Observable.just(true) + else -> view.showCopyDialog(context.getString(R.string.blocking_manager_call_control_title)) + .toObservable() + } + } + .doOnNext { newState { copy() } } // Radio button may have been selected when it shouldn't, fix it + .filter { it } + .observeOn(Schedulers.io()) + .map { getAddressesToBlock(callControl) } // This sucks. Can't wait to use coroutines + .switchMap { numbers -> callControl.block(numbers).andThen(Observable.just(Unit)) } // Hack .autoDisposable(view.scope()) .subscribe { callControl.isBlocked("callcontrol").blockingGet() @@ -113,4 +140,8 @@ class BlockingManagerPresenter @Inject constructor( } } + private fun getAddressesToBlock(client: BlockingClient) = conversationRepo.getBlockedConversations() + .fold(listOf(), { numbers, conversation -> numbers + conversation.recipients.map { it.address } }) + .filter { number -> !client.isBlocked(number).blockingGet() } + } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerView.kt index 72e8af0f..f3731cfe 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerView.kt @@ -2,6 +2,7 @@ package com.moez.QKSMS.feature.blocking.manager import com.moez.QKSMS.common.base.QkViewContract import io.reactivex.Observable +import io.reactivex.Single interface BlockingManagerView : QkViewContract { @@ -13,6 +14,7 @@ interface BlockingManagerView : QkViewContract { fun siaClicked(): Observable<*> fun launchSiaClicked(): Observable<*> + fun showCopyDialog(manager: String): Single fun openBlockedNumbers() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt index 059f50af..2ba7e445 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt @@ -35,7 +35,7 @@ class BlockedMessagesPresenter @Inject constructor( private val deleteConversations: DeleteConversations, private val navigator: Navigator ) : QkPresenter(BlockedMessagesState( - data = conversationRepo.getBlockedConversations() + data = conversationRepo.getBlockedConversationsAsync() )) { override fun bindIntents(view: BlockedMessagesView) { diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index ef3289e6..5a68b91d 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -265,6 +265,8 @@ Should I Answer? Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app + Copy blocked numbers + Continue to %s copy over your existing blocked numbers Blocked numbers Your blocked numbers will appear here