From b6d1af37604488c9d969b8fb3c100f7eedfbbe4f Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 16 Jun 2022 11:55:09 -0400 Subject: [PATCH] Add possible fix for weird send button state. --- .../thoughtcrime/securesms/components/SendButton.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 bb54cfe6bd..1c3b514fb4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt @@ -66,7 +66,17 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage } } - throw AssertionError("No options of default type!") + Log.w(TAG, "No options of default type! Resetting. DefaultTransportType: $defaultTransportType, AllAvailable: ${availableSendTypes.map { it.transportType }}") + + val signalType: MessageSendType? = availableSendTypes.firstOrNull { it.usesSignalTransport } + if (signalType != null) { + Log.w(TAG, "No options of default type, but Signal type is available. Switching. DefaultTransportType: $defaultTransportType, AllAvailable: ${availableSendTypes.map { it.transportType }}") + defaultTransportType = MessageSendType.TransportType.SIGNAL + onSelectionChanged(signalType, false) + return signalType + } else { + throw AssertionError("No options of default type! DefaultTransportType: $defaultTransportType, AllAvailable: ${availableSendTypes.map { it.transportType }}") + } } fun addOnSelectionChangedListener(listener: SendTypeChangedListener) {