diff --git a/data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt index ebf56d1c..4daf184f 100644 --- a/data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt @@ -73,6 +73,9 @@ class ExternalBlockingManagerImpl @Inject constructor( // intent to request a rating if (prefs.sia.get()) { intent = tryOrNull(false) { + context.packageManager.getApplicationInfo("org.mistergroup.shouldianswer", 0).enabled + Intent("org.mistergroup.shouldianswer.PublicService").setPackage("org.mistergroup.shouldianswer") + } ?: tryOrNull(false) { context.packageManager.getApplicationInfo("org.mistergroup.shouldianswerpersonal", 0).enabled Intent("org.mistergroup.shouldianswerpersonal.PublicService") .setPackage("org.mistergroup.shouldianswerpersonal") @@ -96,20 +99,21 @@ class ExternalBlockingManagerImpl @Inject constructor( serviceMessenger = Messenger(service) isBound = true - val msg = Message() - msg.what = GET_NUMBER_RATING - msg.data = bundleOf(Pair("number", address)) - msg.replyTo = Messenger(IncomingHandler { rating -> - subject.onSuccess(rating == RATING_NEGATIVE) - Timber.v("Should block: ${rating == RATING_NEGATIVE}") + val message = Message().apply { + what = GET_NUMBER_RATING + data = bundleOf("number" to address) + replyTo = Messenger(IncomingHandler { rating -> + subject.onSuccess(rating == RATING_NEGATIVE) + Timber.v("Should block: ${rating == RATING_NEGATIVE}") - // We're done, so unbind the service - if (isBound && serviceMessenger != null) { - context.unbindService(this) - } - }) + // We're done, so unbind the service + if (isBound && serviceMessenger != null) { + context.unbindService(this@Binder) + } + }) + } - serviceMessenger?.send(msg) + serviceMessenger?.send(message) } override fun onServiceDisconnected(className: ComponentName) { @@ -119,7 +123,6 @@ class ExternalBlockingManagerImpl @Inject constructor( } private class IncomingHandler(private val callback: (rating: Int) -> Unit) : Handler() { - override fun handleMessage(msg: Message) { when (msg.what) { GET_NUMBER_RATING -> callback(msg.data.getInt("rating")) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index ddb0d037..904fae2f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt @@ -184,7 +184,7 @@ class Navigator @Inject constructor( * Launch the Play Store and display the Should I Answer? listing */ fun showSia() { - val url = "https://play.google.com/store/apps/details?id=org.mistergroup.shouldianswerpersonal" + val url = "https://play.google.com/store/apps/details?id=org.mistergroup.shouldianswer" val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) startActivity(intent) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt index dfd6ad39..d8396c47 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt @@ -53,7 +53,8 @@ class BlockedViewModel @Inject constructor( view.siaClickedIntent .map { - tryOrNull(false) { context.packageManager.getApplicationInfo("org.mistergroup.shouldianswerpersonal", 0).enabled } + tryOrNull(false) { context.packageManager.getApplicationInfo("org.mistergroup.shouldianswer", 0).enabled } + ?: tryOrNull(false) { context.packageManager.getApplicationInfo("org.mistergroup.shouldianswerpersonal", 0).enabled } ?: tryOrNull(false) { context.packageManager.getApplicationInfo("org.mistergroup.muzutozvednout", 0).enabled } ?: false }