From 9ef58516e212019c3a0473541fb0d9a0c1149efd Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 27 Oct 2022 15:50:39 -0300
Subject: [PATCH] Ensure donation error dialogs are shown from main thread.

---
 .../donate/DonateToSignalFragment.kt            | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt
index 2e0bee1e31..544e5a98ce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt
@@ -18,6 +18,7 @@ import com.airbnb.lottie.LottieAnimationView
 import com.google.android.gms.wallet.PaymentData
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.kotlin.subscribeBy
 import org.signal.core.util.dp
 import org.signal.core.util.logging.Log
@@ -166,13 +167,17 @@ class DonateToSignalFragment : DSLSettingsFragment(
 
     disposables.bindTo(viewLifecycleOwner)
 
-    disposables += DonationError.getErrorsForSource(DonationErrorSource.BOOST).subscribe { error ->
-      showErrorDialog(error)
-    }
+    disposables += DonationError.getErrorsForSource(DonationErrorSource.BOOST)
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribe { error ->
+        showErrorDialog(error)
+      }
 
-    disposables += DonationError.getErrorsForSource(DonationErrorSource.SUBSCRIPTION).subscribe { error ->
-      showErrorDialog(error)
-    }
+    disposables += DonationError.getErrorsForSource(DonationErrorSource.SUBSCRIPTION)
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribe { error ->
+        showErrorDialog(error)
+      }
 
     disposables += viewModel.actions.subscribe { action ->
       when (action) {