Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure SMS and MMS messages are sent appropriately.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-01-06 11:27:33 -05:00
parent 5537039e46
commit e2fb65920c
18 changed files with 70 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View File

@@ -267,6 +267,7 @@ import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet;
import org.thoughtcrime.securesms.search.MessageResult;
import org.thoughtcrime.securesms.service.KeyCachingService;
import org.thoughtcrime.securesms.sms.MessageSender;
import org.thoughtcrime.securesms.sms.MessageSender.SendType;
import org.thoughtcrime.securesms.stickers.StickerEventListener;
import org.thoughtcrime.securesms.stickers.StickerLocator;
import org.thoughtcrime.securesms.stickers.StickerManagementActivity;
@@ -3113,7 +3114,7 @@ public class ConversationParentFragment extends Fragment
final long id = fragment.stageOutgoingMessage(outgoingMessage);
SimpleTask.run(() -> {
return MessageSender.send(context, outgoingMessage, thread, sendType.usesSmsTransport(), metricId, null);
return MessageSender.send(context, outgoingMessage, thread, sendType.usesSmsTransport() ? SendType.MMS : SendType.SIGNAL, metricId, null);
}, result -> {
sendComplete(result);
future.set(null);
@@ -3153,7 +3154,7 @@ public class ConversationParentFragment extends Fragment
.withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_sms_permission_in_order_to_send_an_sms))
.onAllGranted(() -> {
SimpleTask.run(() -> {
return MessageSender.send(context, message, thread, sendType.usesSmsTransport(), metricId, null);
return MessageSender.send(context, message, thread, sendType.usesSmsTransport() ? SendType.SMS : SendType.SIGNAL, metricId, null);
}, this::sendComplete);
silentlySetComposeText("");