From 07f7d0b7fa6c09c66fb9d2f3d323480863141aa8 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Sat, 31 Aug 2019 02:27:45 +0200 Subject: [PATCH] Move location of sia preference migration --- .../java/com/moez/QKSMS/blocking/BlockingManager.kt | 8 -------- .../moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt b/data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt index e4e7f678..23d9e758 100644 --- a/data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt +++ b/data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt @@ -24,14 +24,6 @@ class BlockingManager @Inject constructor( else -> qksmsBlockingClient } - init { - // Migrate from old SIA preference to blocking manager preference - if (prefs.sia.get()) { - prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_SIA) - prefs.sia.delete() - } - } - override fun isAvailable(): Boolean = client.isAvailable() override fun getClientCapability(): BlockingClient.Capability = client.getClientCapability() diff --git a/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt index 4b1ad8fc..7585f28d 100644 --- a/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt +++ b/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt @@ -29,6 +29,7 @@ import android.os.Message import android.os.Messenger import androidx.core.os.bundleOf import com.moez.QKSMS.common.util.extensions.isInstalled +import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.tryOrNull import io.reactivex.Completable import io.reactivex.Single @@ -36,6 +37,7 @@ import io.reactivex.subjects.SingleSubject import javax.inject.Inject class ShouldIAnswerBlockingClient @Inject constructor( + prefs: Preferences, private val context: Context ) : BlockingClient { @@ -48,6 +50,14 @@ class ShouldIAnswerBlockingClient @Inject constructor( const val GET_NUMBER_RATING = 1 } + init { + // Migrate from old SIA preference to blocking manager preference + if (prefs.sia.get()) { + prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_SIA) + prefs.sia.delete() + } + } + override fun isAvailable(): Boolean = listOf("org.mistergroup.shouldianswer", "org.mistergroup.shouldianswerpersonal", "org.mistergroup.muzutozvednout")