Refactor qksms blocking client to android blocking client

This commit is contained in:
moezbhatti
2019-07-30 12:22:22 -04:00
parent 9ebf4bfd4b
commit 354168ab21
11 changed files with 25 additions and 24 deletions
@@ -29,7 +29,7 @@ import io.reactivex.Completable
import io.reactivex.Single import io.reactivex.Single
import javax.inject.Inject import javax.inject.Inject
class QkBlockingClient @Inject constructor( class AndroidBlockingClient @Inject constructor(
private val context: Context, private val context: Context,
private val blockingRepo: BlockingRepository private val blockingRepo: BlockingRepository
) : BlockingClient { ) : BlockingClient {
@@ -13,7 +13,7 @@ import javax.inject.Singleton
class BlockingManager @Inject constructor( class BlockingManager @Inject constructor(
private val prefs: Preferences, private val prefs: Preferences,
private val callControlBlockingClient: CallControlBlockingClient, private val callControlBlockingClient: CallControlBlockingClient,
private val qkBlockingClient: QkBlockingClient, private val androidBlockingClient: AndroidBlockingClient,
private val shouldIAnswerBlockingClient: ShouldIAnswerBlockingClient private val shouldIAnswerBlockingClient: ShouldIAnswerBlockingClient
) : BlockingClient { ) : BlockingClient {
@@ -21,7 +21,7 @@ class BlockingManager @Inject constructor(
get() = when (prefs.blockingManager.get()) { get() = when (prefs.blockingManager.get()) {
Preferences.BLOCKING_MANAGER_SIA -> shouldIAnswerBlockingClient Preferences.BLOCKING_MANAGER_SIA -> shouldIAnswerBlockingClient
Preferences.BLOCKING_MANAGER_CC -> callControlBlockingClient Preferences.BLOCKING_MANAGER_CC -> callControlBlockingClient
else -> qkBlockingClient else -> androidBlockingClient
} }
init { init {
@@ -61,7 +61,7 @@ class Preferences @Inject constructor(private val rxPrefs: RxSharedPreferences)
const val SWIPE_ACTION_READ = 4 const val SWIPE_ACTION_READ = 4
const val SWIPE_ACTION_UNREAD = 5 const val SWIPE_ACTION_UNREAD = 5
const val BLOCKING_MANAGER_QKSMS = 0 const val BLOCKING_MANAGER_ANDROID = 0
const val BLOCKING_MANAGER_CC = 1 const val BLOCKING_MANAGER_CC = 1
const val BLOCKING_MANAGER_SIA = 2 const val BLOCKING_MANAGER_SIA = 2
} }
@@ -82,7 +82,7 @@ class Preferences @Inject constructor(private val rxPrefs: RxSharedPreferences)
val textSize = rxPrefs.getInteger("textSize", TEXT_SIZE_NORMAL) val textSize = rxPrefs.getInteger("textSize", TEXT_SIZE_NORMAL)
@Deprecated("This should only be accessed when migrating to @blockingManager") @Deprecated("This should only be accessed when migrating to @blockingManager")
val sia = rxPrefs.getBoolean("sia", false) val sia = rxPrefs.getBoolean("sia", false)
val blockingManager = rxPrefs.getInteger("blockingManager", BLOCKING_MANAGER_QKSMS) val blockingManager = rxPrefs.getInteger("blockingManager", BLOCKING_MANAGER_ANDROID)
val drop = rxPrefs.getBoolean("drop", false) val drop = rxPrefs.getBoolean("drop", false)
val notifAction1 = rxPrefs.getInteger("notifAction1", NOTIFICATION_ACTION_READ) val notifAction1 = rxPrefs.getInteger("notifAction1", NOTIFICATION_ACTION_READ)
val notifAction2 = rxPrefs.getInteger("notifAction2", NOTIFICATION_ACTION_REPLY) val notifAction2 = rxPrefs.getInteger("notifAction2", NOTIFICATION_ACTION_REPLY)
@@ -69,7 +69,7 @@ class BlockingDialog @Inject constructor(
val manager = context.getString(when (prefs.blockingManager.get()) { val manager = context.getString(when (prefs.blockingManager.get()) {
Preferences.BLOCKING_MANAGER_SIA -> R.string.blocking_manager_sia_title Preferences.BLOCKING_MANAGER_SIA -> R.string.blocking_manager_sia_title
Preferences.BLOCKING_MANAGER_CC -> R.string.blocking_manager_call_control_title Preferences.BLOCKING_MANAGER_CC -> R.string.blocking_manager_call_control_title
else -> R.string.app_name else -> R.string.blocking_manager_android_title
}) })
val message = context.resources.getQuantityString(res, addresses.size, manager) val message = context.resources.getQuantityString(res, addresses.size, manager)
@@ -43,7 +43,7 @@ class BlockingPresenter @Inject constructor(
when (client) { when (client) {
Preferences.BLOCKING_MANAGER_SIA -> R.string.blocking_manager_sia_title Preferences.BLOCKING_MANAGER_SIA -> R.string.blocking_manager_sia_title
Preferences.BLOCKING_MANAGER_CC -> R.string.blocking_manager_call_control_title Preferences.BLOCKING_MANAGER_CC -> R.string.blocking_manager_call_control_title
else -> R.string.app_name else -> R.string.blocking_manager_android_title
} }
} }
.map(context::getString) .map(context::getString)
@@ -42,7 +42,7 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
} }
override fun render(state: BlockingManagerState) { override fun render(state: BlockingManagerState) {
qksms.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_QKSMS android.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_ANDROID
callControl.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_CC callControl.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_CC
callControl.launch.setImageResource(when (state.callControlInstalled) { callControl.launch.setImageResource(when (state.callControlInstalled) {
@@ -58,8 +58,8 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
} }
override fun activityResumed(): Observable<*> = activityResumedSubject override fun activityResumed(): Observable<*> = activityResumedSubject
override fun qksmsClicked(): Observable<*> = qksms.clicks() override fun androidClicked(): Observable<*> = android.clicks()
override fun launchQksmsClicked(): Observable<*> = qksms.launch.clicks() override fun launchAndroidClicked(): Observable<*> = android.launch.clicks()
override fun callControlClicked(): Observable<*> = callControl.clicks() override fun callControlClicked(): Observable<*> = callControl.clicks()
override fun launchCallControlClicked(): Observable<*> = callControl.launch.clicks() override fun launchCallControlClicked(): Observable<*> = callControl.launch.clicks()
override fun siaClicked(): Observable<*> = shouldIAnswer.clicks() override fun siaClicked(): Observable<*> = shouldIAnswer.clicks()
@@ -1,8 +1,8 @@
package com.moez.QKSMS.feature.blocking.manager package com.moez.QKSMS.feature.blocking.manager
import android.os.Build import android.os.Build
import com.moez.QKSMS.blocking.AndroidBlockingClient
import com.moez.QKSMS.blocking.CallControlBlockingClient import com.moez.QKSMS.blocking.CallControlBlockingClient
import com.moez.QKSMS.blocking.QkBlockingClient
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
@@ -14,10 +14,10 @@ import javax.inject.Inject
class BlockingManagerPresenter @Inject constructor( class BlockingManagerPresenter @Inject constructor(
private val analytics: AnalyticsManager, private val analytics: AnalyticsManager,
private val android: AndroidBlockingClient,
private val callControl: CallControlBlockingClient, private val callControl: CallControlBlockingClient,
private val navigator: Navigator, private val navigator: Navigator,
private val prefs: Preferences, private val prefs: Preferences,
private val qksms: QkBlockingClient,
private val shouldIAnswer: ShouldIAnswerBlockingClient private val shouldIAnswer: ShouldIAnswerBlockingClient
) : QkPresenter<BlockingManagerView, BlockingManagerState>(BlockingManagerState( ) : QkPresenter<BlockingManagerView, BlockingManagerState>(BlockingManagerState(
blockingManager = prefs.blockingManager.get(), blockingManager = prefs.blockingManager.get(),
@@ -45,21 +45,21 @@ class BlockingManagerPresenter @Inject constructor(
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { available -> newState { copy(siaInstalled = available) } } .subscribe { available -> newState { copy(siaInstalled = available) } }
view.qksmsClicked() view.androidClicked()
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { .subscribe {
analytics.setUserProperty("Blocking Manager", "QKSMS") analytics.setUserProperty("Blocking Manager", "Android")
prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_QKSMS) prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_ANDROID)
} }
view.launchQksmsClicked() view.launchAndroidClicked()
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { .subscribe {
// TODO: This is a hack, get rid of it once we implement AndroidX navigation // TODO: This is a hack, get rid of it once we implement AndroidX navigation
if (Build.VERSION.SDK_INT < 24) { if (Build.VERSION.SDK_INT < 24) {
view.openBlockedNumbers() view.openBlockedNumbers()
} else { } else {
qksms.openSettings() android.openSettings()
} }
} }
@@ -6,8 +6,8 @@ import io.reactivex.Observable
interface BlockingManagerView : QkViewContract<BlockingManagerState> { interface BlockingManagerView : QkViewContract<BlockingManagerState> {
fun activityResumed(): Observable<*> fun activityResumed(): Observable<*>
fun qksmsClicked(): Observable<*> fun androidClicked(): Observable<*>
fun launchQksmsClicked(): Observable<*> fun launchAndroidClicked(): Observable<*>
fun callControlClicked(): Observable<*> fun callControlClicked(): Observable<*>
fun launchCallControlClicked(): Observable<*> fun launchCallControlClicked(): Observable<*>
fun siaClicked(): Observable<*> fun siaClicked(): Observable<*>
@@ -39,7 +39,7 @@
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:title="@string/blocking_manager_title" app:title="@string/blocking_manager_title"
tools:summary="@string/app_name" /> tools:summary="@string/blocking_manager_android_title" />
<com.moez.QKSMS.common.widget.PreferenceView <com.moez.QKSMS.common.widget.PreferenceView
android:id="@+id/drop" android:id="@+id/drop"
@@ -31,11 +31,11 @@
android:paddingBottom="8dp"> android:paddingBottom="8dp">
<com.moez.QKSMS.common.widget.RadioPreferenceView <com.moez.QKSMS.common.widget.RadioPreferenceView
android:id="@+id/qksms" android:id="@+id/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:summary="@string/blocking_manager_qksms_summary" app:summary="@string/blocking_manager_android_summary"
app:title="@string/app_name" app:title="@string/blocking_manager_android_title"
app:widget="@layout/blocking_manager_list_option" /> app:widget="@layout/blocking_manager_list_option" />
<com.moez.QKSMS.common.widget.RadioPreferenceView <com.moez.QKSMS.common.widget.RadioPreferenceView
+2 -1
View File
@@ -258,7 +258,8 @@
<string name="blocking_empty">Your blocked conversations will appear here</string> <string name="blocking_empty">Your blocked conversations will appear here</string>
<string name="blocking_manager_title">Blocking Manager</string> <string name="blocking_manager_title">Blocking Manager</string>
<string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string> <string name="blocking_manager_android_title">Android</string>
<string name="blocking_manager_android_summary">Built-in blocking functionality in Android</string>
<!-- Do not translate --> <!-- Do not translate -->
<string name="blocking_manager_call_control_title">Call Control</string> <string name="blocking_manager_call_control_title">Call Control</string>
<string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string> <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>