From c95fd7cf0cc1d6ba788d6f06d53d834f03ad2052 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 12 Jul 2022 09:09:16 -0400
Subject: [PATCH] Fix stale send type when reloading a conversation.

---
 .../thoughtcrime/securesms/components/SendButton.kt | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt b/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt
index 2ebc9bd4c9..dcfb8818bc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt
@@ -95,15 +95,10 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage
 
   fun resetAvailableTransports(isMediaMessage: Boolean) {
     availableSendTypes = MessageSendType.getAllAvailable(context, isMediaMessage)
-
-    if (!availableSendTypes.contains(activeMessageSendType)) {
-      Log.w(TAG, "[resetAvailableTransports] The active send type is no longer available. Unsetting.")
-      setSendType(null)
-    } else {
-      defaultTransportType = MessageSendType.TransportType.SMS
-      defaultSubscriptionId = null
-      onSelectionChanged(newType = selectedSendType, isManualSelection = false)
-    }
+    activeMessageSendType = null
+    defaultTransportType = MessageSendType.TransportType.SMS
+    defaultSubscriptionId = null
+    onSelectionChanged(newType = selectedSendType, isManualSelection = false)
   }
 
   fun disableTransportType(type: MessageSendType.TransportType) {