Prevent us from ever having no default transport option.

fork-5.53.8
Greyson Parrelli 2022-02-04 12:01:31 -05:00 zatwierdzone przez Alex Hart
rodzic dd9632da5b
commit d7bf4f178f
1 zmienionych plików z 8 dodań i 5 usunięć

Wyświetl plik

@ -1552,18 +1552,21 @@ public class ConversationParentFragment extends Fragment
sendButton.resetAvailableTransports(isMediaMessage);
if (!isSecureText && !isPushGroupConversation() && !recipient.get().isAciOnly() && !recipient.get().isReleaseNotes()) {
sendButton.disableTransport(Type.TEXTSECURE);
}
boolean smsEnabled = true;
if (recipient.get().isPushGroup() || (!recipient.get().isMmsGroup() && !recipient.get().hasSmsAddress())) {
sendButton.disableTransport(Type.SMS);
smsEnabled = false;
}
if (!recipient.get().isPushGroup() && recipient.get().isForceSmsSelection()) {
if (!isSecureText && !isPushGroupConversation() && !recipient.get().isAciOnly() && !recipient.get().isReleaseNotes() && smsEnabled) {
sendButton.disableTransport(Type.TEXTSECURE);
}
if (!recipient.get().isPushGroup() && recipient.get().isForceSmsSelection() && smsEnabled) {
sendButton.setDefaultTransport(Type.SMS);
} else {
if (isSecureText || isPushGroupConversation() || recipient.get().isAciOnly() || recipient.get().isReleaseNotes()) {
if (isSecureText || isPushGroupConversation() || recipient.get().isAciOnly() || recipient.get().isReleaseNotes() || !smsEnabled) {
sendButton.setDefaultTransport(Type.TEXTSECURE);
} else {
sendButton.setDefaultTransport(Type.SMS);