From 3be5d61ceda013b30982caea9fb0c175f0e44877 Mon Sep 17 00:00:00 2001
From: Clark <clark@signal.org>
Date: Wed, 16 Aug 2023 10:48:51 -0400
Subject: [PATCH] Fix wrong thread crash when revoking message while editing.

---
 .../conversation/v2/ConversationFragment.kt         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index efd80f4d25..cb9f09fc5a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -2208,13 +2208,14 @@ class ConversationFragment :
     disposables += DeleteDialog.show(
       context = requireContext(),
       messageRecords = records
-    ).subscribe { (deleted: Boolean, _: Boolean) ->
-      if (!deleted) return@subscribe
-      val editMessageId = inputPanel.editMessageId?.id
-      if (editMessageId != null && records.any { it.id == editMessageId }) {
-        inputPanel.exitEditMessageMode()
+    ).observeOn(AndroidSchedulers.mainThread())
+      .subscribe { (deleted: Boolean, _: Boolean) ->
+        if (!deleted) return@subscribe
+        val editMessageId = inputPanel.editMessageId?.id
+        if (editMessageId != null && records.any { it.id == editMessageId }) {
+          inputPanel.exitEditMessageMode()
+        }
       }
-    }
   }
 
   private inner class SwipeAvailabilityProvider : ConversationItemSwipeCallback.SwipeAvailabilityProvider {