Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5fa1ce0 authored by moezbhatti's avatar moezbhatti
Browse files

Don't show blocking dialog if not necessary

parent 1439e3f1

build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ buildscript { 
    ext.androidx_viewpager_version = '1.0.0-alpha01'

    ext.autodispose_version = '1.3.0'

    ext.conductor_version = '2.1.5'

    ext.coroutines_version = '1.2.2'

    ext.dagger_version = "2.16"

    ext.espresso_version = '3.1.0-alpha3'

    ext.exoplayer_version = "2.8.1"

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

+2 −4
Original line number Diff line number Diff line
@@ -34,14 +34,12 @@ class BlockingManager @Inject constructor( 


    override fun isAvailable(): Boolean = client.isAvailable()



    override fun isBlocked(address: String): Single<Boolean> = client.isBlocked(address)

    override fun getClientCapability(): BlockingClientCapability = client.getClientCapability()



    override fun canBlock(): Boolean = client.canBlock()

    override fun isBlocked(address: String): Single<Boolean> = client.isBlocked(address)



    override fun block(addresses: List<String>): Completable = client.block(addresses)



    override fun canUnblock(): Boolean = client.canUnblock()



    override fun unblock(addresses: List<String>): Completable = client.unblock(addresses)



    override fun openSettings() = client.openSettings()

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

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ class CallControlBlockingClient @Inject constructor( 


    override fun isAvailable(): Boolean = context.isInstalled("com.flexaspect.android.everycallcontrol")



    override fun getClientCapability() = BlockingClientCapability.BLOCK_WITH_PERMISSION



    override fun isBlocked(address: String): Single<Boolean> {

        val uri = Uri.withAppendedPath(CallControl.LOOKUP_TEXT_URI, address)

        return Single.fromCallable {

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

+2 −4
Original line number Diff line number Diff line
@@ -29,18 +29,16 @@ class QksmsBlockingClient @Inject constructor( 


    override fun isAvailable(): Boolean = true



    override fun getClientCapability() = BlockingClientCapability.BLOCK_WITHOUT_PERMISSION



    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())

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ class ShouldIAnswerBlockingClient @Inject constructor( 
            "org.mistergroup.muzutozvednout")

            .any(context::isInstalled)



    override fun getClientCapability() = BlockingClientCapability.CANT_BLOCK



    /**

     * Return a Single<Boolean> which emits whether or not the given [address] should be blocked

     */