Merge branch 'master' into upgrade-smsmms-group-individual-send-no-wait-appear-delayed-mms-mms-receive-to-worker-send-ack-mmsc

This commit is contained in:
Inhishonor
2025-10-09 18:01:59 -07:00
254 changed files with 2886 additions and 1596 deletions
@@ -18,14 +18,15 @@
*/
package dev.octoshrimpy.quik.receiver
import android.annotation.SuppressLint
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.blocking.BlockingClient
import dev.octoshrimpy.quik.interactor.MarkBlocked
import dev.octoshrimpy.quik.repository.ConversationRepository
import dev.octoshrimpy.quik.util.Preferences
import dagger.android.AndroidInjection
import io.reactivex.schedulers.Schedulers
import timber.log.Timber
import javax.inject.Inject
@@ -37,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)
@@ -57,8 +59,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()
}
)
}
}