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

Commit 354168ab authored by moezbhatti's avatar moezbhatti
Browse files

Refactor qksms blocking client to android blocking client

parent 9ebf4bfd

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

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import io.reactivex.Completable 
import io.reactivex.Single

import javax.inject.Inject



class QkBlockingClient @Inject constructor(

class AndroidBlockingClient @Inject constructor(

    private val context: Context,

    private val blockingRepo: BlockingRepository

) : BlockingClient {

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

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ import javax.inject.Singleton 
class BlockingManager @Inject constructor(

    private val prefs: Preferences,

    private val callControlBlockingClient: CallControlBlockingClient,

    private val qkBlockingClient: QkBlockingClient,

    private val androidBlockingClient: AndroidBlockingClient,

    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 -> qkBlockingClient

            else -> androidBlockingClient

        }



    init {

domain/src/main/java/com/moez/QKSMS/util/Preferences.kt

+2 −2
Original line number Diff line number Diff line
@@ -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_QKSMS = 0

        const val BLOCKING_MANAGER_ANDROID = 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_QKSMS)

    val blockingManager = rxPrefs.getInteger("blockingManager", BLOCKING_MANAGER_ANDROID)

    val drop = rxPrefs.getBoolean("drop", false)

    val notifAction1 = rxPrefs.getInteger("notifAction1", NOTIFICATION_ACTION_READ)

    val notifAction2 = rxPrefs.getInteger("notifAction2", NOTIFICATION_ACTION_REPLY)

presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingDialog.kt

+1 −1
Original line number Diff line number Diff line
@@ -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.app_name

            else -> R.string.blocking_manager_android_title

        })



        val message = context.resources.getQuantityString(res, addresses.size, manager)

presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,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.app_name

                        else -> R.string.blocking_manager_android_title

                    }

                }

                .map(context::getString)