From 8705c32ee7b993a3be8292173a1ff037c8962735 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Tue, 10 Jun 2025 16:31:32 -0700 Subject: [PATCH] Allow blocking thread to complete before being disposed. If we call dispose after subscribe the process doesn't get to complete, leaving the notification, and eventually crashing the app. SupressLint is necessary to avoid warnings on not calling dispose. --- .../moez/QKSMS/receiver/BlockThreadReceiver.kt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt index ea2c2193..f3a6ddbb 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt @@ -18,6 +18,7 @@ */ package dev.octoshrimpy.quik.receiver +import android.annotation.SuppressLint import android.content.BroadcastReceiver import android.content.Context import android.content.Intent @@ -27,6 +28,7 @@ import dev.octoshrimpy.quik.interactor.MarkBlocked import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.util.Preferences import io.reactivex.schedulers.Schedulers +import timber.log.Timber import javax.inject.Inject class BlockThreadReceiver : BroadcastReceiver() { @@ -36,6 +38,7 @@ class BlockThreadReceiver : BroadcastReceiver() { @Inject lateinit var markBlocked: MarkBlocked @Inject lateinit var prefs: Preferences + @SuppressLint("CheckResult") override fun onReceive(context: Context, intent: Intent) { AndroidInjection.inject(this, context) @@ -54,8 +57,14 @@ class BlockThreadReceiver : BroadcastReceiver() { MarkBlocked.Params(listOf(threadId), prefs.blockingManager.get(), null) ) ) - .subscribe { goAsync().finish() } - .dispose() + .subscribe( + { + goAsync().finish() + }, + { error -> + Timber.e("BlockThreadReceiver", "blocking failed") + goAsync().finish() + } + ) } - }