Don't use system blocking provider, since it won't let messages reach QKSMS anyway

This commit is contained in:
moezbhatti
2019-08-22 22:14:27 +02:00
parent 6b3fffda85
commit d91c9043da
12 changed files with 74 additions and 113 deletions
@@ -69,7 +69,7 @@ class BlockingDialog @Inject constructor(
val manager = context.getString(when (prefs.blockingManager.get()) {
Preferences.BLOCKING_MANAGER_SIA -> R.string.blocking_manager_sia_title
Preferences.BLOCKING_MANAGER_CC -> R.string.blocking_manager_call_control_title
else -> R.string.blocking_manager_android_title
else -> R.string.blocking_manager_qksms_title
})
val message = context.resources.getQuantityString(res, addresses.size, manager)
@@ -44,7 +44,7 @@ class BlockingPresenter @Inject constructor(
when (client) {
Preferences.BLOCKING_MANAGER_SIA -> R.string.blocking_manager_sia_title
Preferences.BLOCKING_MANAGER_CC -> R.string.blocking_manager_call_control_title
else -> R.string.blocking_manager_android_title
else -> R.string.blocking_manager_qksms_title
}
}
.map(context::getString)
@@ -42,7 +42,7 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
}
override fun render(state: BlockingManagerState) {
android.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_ANDROID
qksms.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_QKSMS
callControl.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_CC
callControl.launch.setImageResource(when (state.callControlInstalled) {
@@ -58,8 +58,8 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
}
override fun activityResumed(): Observable<*> = activityResumedSubject
override fun androidClicked(): Observable<*> = android.clicks()
override fun launchAndroidClicked(): Observable<*> = android.launch.clicks()
override fun qksmsClicked(): Observable<*> = qksms.clicks()
override fun launchQksmsClicked(): Observable<*> = qksms.launch.clicks()
override fun callControlClicked(): Observable<*> = callControl.clicks()
override fun launchCallControlClicked(): Observable<*> = callControl.launch.clicks()
override fun siaClicked(): Observable<*> = shouldIAnswer.clicks()
@@ -1,8 +1,7 @@
package com.moez.QKSMS.feature.blocking.manager
import android.os.Build
import com.moez.QKSMS.blocking.AndroidBlockingClient
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
@@ -15,10 +14,10 @@ import javax.inject.Inject
class BlockingManagerPresenter @Inject constructor(
private val analytics: AnalyticsManager,
private val android: AndroidBlockingClient,
private val callControl: CallControlBlockingClient,
private val navigator: Navigator,
private val prefs: Preferences,
private val qksms: QksmsBlockingClient,
private val shouldIAnswer: ShouldIAnswerBlockingClient
) : QkPresenter<BlockingManagerView, BlockingManagerState>(BlockingManagerState(
blockingManager = prefs.blockingManager.get(),
@@ -46,22 +45,18 @@ class BlockingManagerPresenter @Inject constructor(
.autoDisposable(view.scope())
.subscribe { available -> newState { copy(siaInstalled = available) } }
view.androidClicked()
view.qksmsClicked()
.autoDisposable(view.scope())
.subscribe {
analytics.setUserProperty("Blocking Manager", "Android")
prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_ANDROID)
analytics.setUserProperty("Blocking Manager", "QKSMS")
prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_QKSMS)
}
view.launchAndroidClicked()
view.launchQksmsClicked()
.autoDisposable(view.scope())
.subscribe {
// TODO: This is a hack, get rid of it once we implement AndroidX navigation
if (Build.VERSION.SDK_INT < 24) {
view.openBlockedNumbers()
} else {
android.openSettings()
}
view.openBlockedNumbers()
}
view.callControlClicked()
@@ -6,8 +6,8 @@ import io.reactivex.Observable
interface BlockingManagerView : QkViewContract<BlockingManagerState> {
fun activityResumed(): Observable<*>
fun androidClicked(): Observable<*>
fun launchAndroidClicked(): Observable<*>
fun qksmsClicked(): Observable<*>
fun launchQksmsClicked(): Observable<*>
fun callControlClicked(): Observable<*>
fun launchCallControlClicked(): Observable<*>
fun siaClicked(): Observable<*>