diff --git a/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt index ca57497d..965658a9 100644 --- a/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt +++ b/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt @@ -25,10 +25,10 @@ import android.net.Uri import androidx.core.database.getStringOrNull import com.moez.QKSMS.common.util.extensions.isInstalled import com.moez.QKSMS.extensions.map -import com.moez.QKSMS.util.tryOrNull import io.reactivex.Completable import io.reactivex.Single -import java.util.ArrayList +import timber.log.Timber +import java.util.* import javax.inject.Inject class CallBlockerBlockingClient @Inject constructor( @@ -43,31 +43,25 @@ class CallBlockerBlockingClient @Inject constructor( override fun getClientCapability() = BlockingClient.Capability.BLOCK_WITH_PERMISSION - override fun shouldBlock(address: String): Single = Single.fromCallable { + override fun shouldBlock(address: String): Single = lookup(address, "incomingNumber") + + override fun isBlacklisted(address: String): Single = lookup(address, "blacklistLookup") + + private fun lookup(address: String, reason: String): Single = Single.fromCallable { val uri = Uri.parse("content://com.cuiet.blockCalls.ContProvBlockCalls/lookup/is.blocked.lookup") - val blockReason = tryOrNull { - context.contentResolver.query(uri, arrayOf("result"), "incomingNumber", arrayOf(address), null) + return@fromCallable try { + val blockReason = context.contentResolver.query(uri, arrayOf("result"), reason, arrayOf(address), null) ?.use { cursor -> cursor.map(::LookupResult) } ?.find { result -> result.blockReason != null } - }?.blockReason + ?.blockReason - when (blockReason) { - "true" -> BlockingClient.Action.Block() - else -> BlockingClient.Action.Unblock - } - } - - override fun isBlacklisted(address: String): Single = Single.fromCallable { - val uri = Uri.parse("content://com.cuiet.blockCalls.ContProvBlockCalls/lookup/is.blocked.lookup") - val blockReason = tryOrNull { - context.contentResolver.query(uri, arrayOf("result"), "blacklistLookup", arrayOf(address), null) - ?.use { cursor -> cursor.map(::LookupResult) } - ?.find { result -> result.blockReason != null } - }?.blockReason - - when (blockReason) { - "true" -> BlockingClient.Action.Block() - else -> BlockingClient.Action.Unblock + when (blockReason) { + "true" -> BlockingClient.Action.Block() + else -> BlockingClient.Action.Unblock + } + } catch (e: Exception) { + Timber.w(e) + BlockingClient.Action.DoNothing } } diff --git a/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt index 35b231f3..a22632fe 100644 --- a/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt +++ b/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt @@ -26,9 +26,9 @@ import androidx.core.database.getStringOrNull import com.callcontrol.datashare.CallControl import com.moez.QKSMS.common.util.extensions.isInstalled import com.moez.QKSMS.extensions.map -import com.moez.QKSMS.util.tryOrNull import io.reactivex.Completable import io.reactivex.Single +import timber.log.Timber import javax.inject.Inject class CallControlBlockingClient @Inject constructor( @@ -52,15 +52,19 @@ class CallControlBlockingClient @Inject constructor( override fun isBlacklisted(address: String): Single = Single.fromCallable { val uri = Uri.withAppendedPath(CallControl.LOOKUP_TEXT_URI, address) - val blockReason = tryOrNull { - context.contentResolver.query(uri, projection, null, null, null) // Query URI + return@fromCallable try { + val blockReason = context.contentResolver.query(uri, projection, null, null, null) // Query URI ?.use { cursor -> cursor.map(::LookupResult) } // Map to Result object ?.find { result -> result.blockReason != null } // Check if any are blocked - }?.blockReason // If none are blocked or we errored at some point, return false + ?.blockReason // If none are blocked or we errored at some point, return false - when (blockReason) { - null -> BlockingClient.Action.Unblock - else -> BlockingClient.Action.Block(blockReason) + when (blockReason) { + null -> BlockingClient.Action.Unblock + else -> BlockingClient.Action.Block(blockReason) + } + } catch (e: Exception) { + Timber.w(e) + BlockingClient.Action.DoNothing } }