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

data/src/main/java/com/moez/QKSMS/blocking/AndroidBlockingClient.kt

@@ -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
-    }
-
-}

data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt

@@ -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 {

data/src/main/java/com/moez/QKSMS/blocking/QksmsBlockingClient.kt

@@ -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
+
+}