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
@@ -1,84 +0,0 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* This file is part of QKSMS.
*
* QKSMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* QKSMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
package com.moez.QKSMS.blocking
import android.content.Context
import android.content.Intent
import android.os.Build
import android.provider.BlockedNumberContract
import android.telecom.TelecomManager
import androidx.core.content.contentValuesOf
import com.moez.QKSMS.repository.BlockingRepository
import io.reactivex.Completable
import io.reactivex.Single
import javax.inject.Inject
class AndroidBlockingClient @Inject constructor(
private val context: Context,
private val blockingRepo: BlockingRepository
) : BlockingClient {
override fun isAvailable(): Boolean = true
override fun isBlocked(address: String): Single<Boolean> = Single.fromCallable {
when {
Build.VERSION.SDK_INT >= 24 -> BlockedNumberContract.isBlocked(context, address)
else -> blockingRepo.isBlocked(address)
}
}
override fun canBlock(): Boolean = true
override fun block(addresses: List<String>): Completable = Completable.fromCallable {
when {
Build.VERSION.SDK_INT >= 24 -> addresses.forEach { address ->
val cv = contentValuesOf(BlockedNumberContract.BlockedNumbers.COLUMN_ORIGINAL_NUMBER to address)
context.contentResolver.insert(BlockedNumberContract.BlockedNumbers.CONTENT_URI, cv)
}
else -> blockingRepo.blockNumber(*addresses.toTypedArray())
}
}
override fun canUnblock(): Boolean = true
override fun unblock(addresses: List<String>): Completable = Completable.fromCallable {
when {
Build.VERSION.SDK_INT >= 24 -> addresses.forEach { address ->
BlockedNumberContract.unblock(context, address)
}
else -> blockingRepo.unblockNumbers(*addresses.toTypedArray())
}
}
override fun openSettings() = when {
Build.VERSION.SDK_INT >= 24 -> {
val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
val intent = telecomManager.createManageBlockedNumbersIntent()
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
context.startActivity(intent)
}
else -> {} // TODO: Do this here once we implement AndroidX navigation
}
}
@@ -13,7 +13,7 @@ import javax.inject.Singleton
class BlockingManager @Inject constructor(
private val prefs: Preferences,
private val callControlBlockingClient: CallControlBlockingClient,
private val androidBlockingClient: AndroidBlockingClient,
private val qksmsBlockingClient: QksmsBlockingClient,
private val shouldIAnswerBlockingClient: ShouldIAnswerBlockingClient
) : BlockingClient {
@@ -21,7 +21,7 @@ class BlockingManager @Inject constructor(
get() = when (prefs.blockingManager.get()) {
Preferences.BLOCKING_MANAGER_SIA -> shouldIAnswerBlockingClient
Preferences.BLOCKING_MANAGER_CC -> callControlBlockingClient
else -> androidBlockingClient
else -> qksmsBlockingClient
}
init {
@@ -0,0 +1,50 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* This file is part of QKSMS.
*
* QKSMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* QKSMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
package com.moez.QKSMS.blocking
import com.moez.QKSMS.repository.BlockingRepository
import io.reactivex.Completable
import io.reactivex.Single
import javax.inject.Inject
class QksmsBlockingClient @Inject constructor(
private val blockingRepo: BlockingRepository
) : BlockingClient {
override fun isAvailable(): Boolean = true
override fun isBlocked(address: String): Single<Boolean> = Single.fromCallable {
blockingRepo.isBlocked(address)
}
override fun canBlock(): Boolean = true
override fun block(addresses: List<String>): Completable = Completable.fromCallable {
blockingRepo.blockNumber(*addresses.toTypedArray())
}
override fun canUnblock(): Boolean = true
override fun unblock(addresses: List<String>): Completable = Completable.fromCallable {
blockingRepo.unblockNumbers(*addresses.toTypedArray())
}
override fun openSettings() = Unit // TODO: Do this here once we implement AndroidX navigation
}
@@ -61,7 +61,7 @@ class Preferences @Inject constructor(private val rxPrefs: RxSharedPreferences)
const val SWIPE_ACTION_READ = 4
const val SWIPE_ACTION_UNREAD = 5
const val BLOCKING_MANAGER_ANDROID = 0
const val BLOCKING_MANAGER_QKSMS = 0
const val BLOCKING_MANAGER_CC = 1
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)
@Deprecated("This should only be accessed when migrating to @blockingManager")
val sia = rxPrefs.getBoolean("sia", false)
val blockingManager = rxPrefs.getInteger("blockingManager", BLOCKING_MANAGER_ANDROID)
val blockingManager = rxPrefs.getInteger("blockingManager", BLOCKING_MANAGER_QKSMS)
val drop = rxPrefs.getBoolean("drop", false)
val notifAction1 = rxPrefs.getInteger("notifAction1", NOTIFICATION_ACTION_READ)
val notifAction2 = rxPrefs.getInteger("notifAction2", NOTIFICATION_ACTION_REPLY)
@@ -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<*>
@@ -39,7 +39,7 @@
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintTop_toTopOf="parent"
app:title="@string/blocking_manager_title"
tools:summary="@string/blocking_manager_android_title" />
tools:summary="@string/blocking_manager_qksms_title" />
<com.moez.QKSMS.common.widget.PreferenceView
android:id="@+id/drop"
@@ -31,11 +31,11 @@
android:paddingBottom="8dp">
<com.moez.QKSMS.common.widget.RadioPreferenceView
android:id="@+id/android"
android:id="@+id/qksms"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:summary="@string/blocking_manager_android_summary"
app:title="@string/blocking_manager_android_title"
app:summary="@string/blocking_manager_qksms_summary"
app:title="@string/blocking_manager_qksms_title"
app:widget="@layout/blocking_manager_list_option" />
<com.moez.QKSMS.common.widget.RadioPreferenceView
+2 -2
View File
@@ -258,8 +258,8 @@
<string name="blocking_empty">Your blocked conversations will appear here</string>
<string name="blocking_manager_title">Blocking Manager</string>
<string name="blocking_manager_android_title">Android</string>
<string name="blocking_manager_android_summary">Built-in blocking functionality in Android</string>
<string name="blocking_manager_qksms_title">QKSMS</string>
<string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
<!-- Do not translate -->
<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>