TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 14:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent attempting to send push media messages to non-phone addresses.

Browse Source 
Prevents crash loop in #8910
This commit is contained in:
Alan Evans 2019-07-08 12:35:09 -04:00 committed by Greyson Parrelli
parent 5c870ca8ea
commit 03b1eb4bd5
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
View File

@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.WorkerThread;
@ -68,6 +69,10 @@ public class PushMediaSendJob extends PushSendJob {
@WorkerThread
public static void enqueue(@NonNull Context context, @NonNull JobManager jobManager, long messageId, @NonNull Address destination) {
try {
if (!destination.isPhone()) {
throw new AssertionError();
}
MmsDatabase database = DatabaseFactory.getMmsDatabase(context);
OutgoingMediaMessage message = database.getOutgoingMessage(messageId);
List<Attachment> attachments = new LinkedList<>();
@ -200,11 +205,19 @@ public class PushMediaSendJob extends PushSendJob {
throw new UndeliverableMessageException("No destination address.");
}
final Address destination = message.getRecipient().getAddress();
if (!destination.isPhone()) {
if (destination.isEmail()) throw new UndeliverableMessageException("Not e164, is email");
if (destination.isGroup()) throw new UndeliverableMessageException("Not e164, is group");
throw new UndeliverableMessageException("Not e164, unknown");
}
try {
rotateSenderCertificateIfNecessary();
SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
SignalServiceAddress address = getPushAddress(message.getRecipient().getAddress());
SignalServiceAddress address = getPushAddress(destination);
List<Attachment> attachments = Stream.of(message.getAttachments()).filterNot(Attachment::isSticker).toList();
List<SignalServiceAttachment> serviceAttachments = getAttachmentPointersFor(attachments);
Optional<byte[]> profileKey = getProfileKey(message.getRecipient());