From 938309d125367713da89c40edaca18fea0b52929 Mon Sep 17 00:00:00 2001
From: Clark <clark@signal.org>
Date: Thu, 27 Jul 2023 16:04:07 -0400
Subject: [PATCH] Remove SMS popup from CFv2.

---
 .../thoughtcrime/securesms/components/SendButton.kt    | 10 +++++-----
 .../securesms/conversation/v2/ConversationFragment.kt  |  1 -
 2 files changed, 5 insertions(+), 6 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 d7aafe4f95..5769d4aceb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt
@@ -35,7 +35,7 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage
   private var defaultTransportType: MessageSendType.TransportType = MessageSendType.TransportType.SIGNAL
   private var defaultSubscriptionId: Int? = null
 
-  lateinit var snackbarContainer: View
+  var snackbarContainer: View? = null
   private var popupContainer: ViewGroup? = null
 
   init {
@@ -157,8 +157,8 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage
 
   fun showSendTypeMenu(): Boolean {
     return if (availableSendTypes.size == 1) {
-      if (scheduledSendListener == null && !SignalStore.misc().smsExportPhase.allowSmsFeatures()) {
-        Snackbar.make(snackbarContainer, R.string.InputPanel__sms_messaging_is_no_longer_supported_in_signal, Snackbar.LENGTH_SHORT).show()
+      if (scheduledSendListener == null && snackbarContainer != null && !SignalStore.misc().smsExportPhase.allowSmsFeatures()) {
+        Snackbar.make(snackbarContainer!!, R.string.InputPanel__sms_messaging_is_no_longer_supported_in_signal, Snackbar.LENGTH_SHORT).show()
       }
       false
     } else {
@@ -177,8 +177,8 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage
       return if (scheduleListener?.canSchedule() == true && selectedSendType.transportType != MessageSendType.TransportType.SMS) {
         scheduleListener.onSendScheduled()
         true
-      } else if (!SignalStore.misc().smsExportPhase.allowSmsFeatures()) {
-        Snackbar.make(snackbarContainer, R.string.InputPanel__sms_messaging_is_no_longer_supported_in_signal, Snackbar.LENGTH_SHORT).show()
+      } else if (snackbarContainer != null && !SignalStore.misc().smsExportPhase.allowSmsFeatures()) {
+        Snackbar.make(snackbarContainer!!, R.string.InputPanel__sms_messaging_is_no_longer_supported_in_signal, Snackbar.LENGTH_SHORT).show()
         true
       } else {
         false
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 04d4567181..a20f921d25 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
@@ -842,7 +842,6 @@ class ConversationFragment :
     }
 
     sendButton.apply {
-      snackbarContainer = binding.root
       setPopupContainer(binding.root)
       setOnClickListener(sendButtonListener)
       setScheduledSendListener(sendButtonListener)