Offer to migrate blocked numbers

This commit is contained in:
moezbhatti
2019-08-30 01:44:06 +02:00
parent b14cc53d7d
commit 03af81336c
7 changed files with 57 additions and 1 deletions
@@ -121,6 +121,13 @@ class ConversationRepositoryImpl @Inject constructor(
} }
override fun getBlockedConversations(): RealmResults<Conversation> { override fun getBlockedConversations(): RealmResults<Conversation> {
return Realm.getDefaultInstance()
.where(Conversation::class.java)
.equalTo("blocked", true)
.findAll()
}
override fun getBlockedConversationsAsync(): RealmResults<Conversation> {
return Realm.getDefaultInstance() return Realm.getDefaultInstance()
.where(Conversation::class.java) .where(Conversation::class.java)
.equalTo("blocked", true) .equalTo("blocked", true)
@@ -39,6 +39,8 @@ interface ConversationRepository {
fun getBlockedConversations(): RealmResults<Conversation> fun getBlockedConversations(): RealmResults<Conversation>
fun getBlockedConversationsAsync(): RealmResults<Conversation>
fun getConversationAsync(threadId: Long): Conversation fun getConversationAsync(threadId: Long): Conversation
fun getConversation(threadId: Long): Conversation? fun getConversation(threadId: Long): Conversation?
@@ -1,6 +1,7 @@
package com.moez.QKSMS.feature.blocking.manager package com.moez.QKSMS.feature.blocking.manager
import android.app.Activity import android.app.Activity
import android.app.AlertDialog
import android.view.View import android.view.View
import com.bluelinelabs.conductor.RouterTransaction import com.bluelinelabs.conductor.RouterTransaction
import com.jakewharton.rxbinding2.view.clicks 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.injection.appComponent
import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.Preferences
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.Single
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import kotlinx.android.synthetic.main.blocking_manager_controller.* import kotlinx.android.synthetic.main.blocking_manager_controller.*
import kotlinx.android.synthetic.main.blocking_manager_list_option.view.* import kotlinx.android.synthetic.main.blocking_manager_list_option.view.*
@@ -65,6 +67,16 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
override fun siaClicked(): Observable<*> = shouldIAnswer.clicks() override fun siaClicked(): Observable<*> = shouldIAnswer.clicks()
override fun launchSiaClicked(): Observable<*> = shouldIAnswer.launch.clicks() override fun launchSiaClicked(): Observable<*> = shouldIAnswer.launch.clicks()
override fun showCopyDialog(manager: String): Single<Boolean> = 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() { override fun openBlockedNumbers() {
router.pushController(RouterTransaction.with(BlockedNumbersController()) router.pushController(RouterTransaction.with(BlockedNumbersController())
.pushChangeHandler(QkChangeHandler()) .pushChangeHandler(QkChangeHandler())
@@ -1,20 +1,29 @@
package com.moez.QKSMS.feature.blocking.manager 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.CallControlBlockingClient
import com.moez.QKSMS.blocking.QksmsBlockingClient import com.moez.QKSMS.blocking.QksmsBlockingClient
import com.moez.QKSMS.blocking.ShouldIAnswerBlockingClient import com.moez.QKSMS.blocking.ShouldIAnswerBlockingClient
import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.common.base.QkPresenter
import com.moez.QKSMS.manager.AnalyticsManager import com.moez.QKSMS.manager.AnalyticsManager
import com.moez.QKSMS.repository.ConversationRepository
import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.autoDisposable import com.uber.autodispose.autoDisposable
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.plusAssign
import io.reactivex.schedulers.Schedulers
import javax.inject.Inject import javax.inject.Inject
class BlockingManagerPresenter @Inject constructor( class BlockingManagerPresenter @Inject constructor(
private val analytics: AnalyticsManager, private val analytics: AnalyticsManager,
private val callControl: CallControlBlockingClient, private val callControl: CallControlBlockingClient,
private val context: Context,
private val conversationRepo: ConversationRepository,
private val navigator: Navigator, private val navigator: Navigator,
private val prefs: Preferences, private val prefs: Preferences,
private val qksms: QksmsBlockingClient, private val qksms: QksmsBlockingClient,
@@ -46,6 +55,9 @@ class BlockingManagerPresenter @Inject constructor(
.subscribe { available -> newState { copy(siaInstalled = available) } } .subscribe { available -> newState { copy(siaInstalled = available) } }
view.qksmsClicked() view.qksmsClicked()
.observeOn(Schedulers.io())
.map { getAddressesToBlock(qksms) }
.switchMap { numbers -> qksms.block(numbers).andThen(Observable.just(Unit)) } // Hack
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { .subscribe {
analytics.setUserProperty("Blocking Manager", "QKSMS") analytics.setUserProperty("Blocking Manager", "QKSMS")
@@ -70,6 +82,21 @@ class BlockingManagerPresenter @Inject constructor(
val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_CC val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_CC
installed && !enabled 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()) .autoDisposable(view.scope())
.subscribe { .subscribe {
callControl.isBlocked("callcontrol").blockingGet() callControl.isBlocked("callcontrol").blockingGet()
@@ -113,4 +140,8 @@ class BlockingManagerPresenter @Inject constructor(
} }
} }
private fun getAddressesToBlock(client: BlockingClient) = conversationRepo.getBlockedConversations()
.fold(listOf<String>(), { numbers, conversation -> numbers + conversation.recipients.map { it.address } })
.filter { number -> !client.isBlocked(number).blockingGet() }
} }
@@ -2,6 +2,7 @@ package com.moez.QKSMS.feature.blocking.manager
import com.moez.QKSMS.common.base.QkViewContract import com.moez.QKSMS.common.base.QkViewContract
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.Single
interface BlockingManagerView : QkViewContract<BlockingManagerState> { interface BlockingManagerView : QkViewContract<BlockingManagerState> {
@@ -13,6 +14,7 @@ interface BlockingManagerView : QkViewContract<BlockingManagerState> {
fun siaClicked(): Observable<*> fun siaClicked(): Observable<*>
fun launchSiaClicked(): Observable<*> fun launchSiaClicked(): Observable<*>
fun showCopyDialog(manager: String): Single<Boolean>
fun openBlockedNumbers() fun openBlockedNumbers()
} }
@@ -35,7 +35,7 @@ class BlockedMessagesPresenter @Inject constructor(
private val deleteConversations: DeleteConversations, private val deleteConversations: DeleteConversations,
private val navigator: Navigator private val navigator: Navigator
) : QkPresenter<BlockedMessagesView, BlockedMessagesState>(BlockedMessagesState( ) : QkPresenter<BlockedMessagesView, BlockedMessagesState>(BlockedMessagesState(
data = conversationRepo.getBlockedConversations() data = conversationRepo.getBlockedConversationsAsync()
)) { )) {
override fun bindIntents(view: BlockedMessagesView) { override fun bindIntents(view: BlockedMessagesView) {
@@ -265,6 +265,8 @@
<!-- Do not translate --> <!-- Do not translate -->
<string name="blocking_manager_sia_title">Should I Answer?</string> <string name="blocking_manager_sia_title">Should I Answer?</string>
<string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string> <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
<string name="blocking_manager_copy_title">Copy blocked numbers</string>
<string name="blocking_manager_copy_summary">Continue to %s copy over your existing blocked numbers</string>
<string name="blocked_numbers_title">Blocked numbers</string> <string name="blocked_numbers_title">Blocked numbers</string>
<string name="blocked_numbers_empty">Your blocked numbers will appear here</string> <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>