51d6144591
1) Remove all our PDU code and switch to the PDU code from the klinker library 2) Switch to using the system Lollipop MMS library by default, and falling back to our own custom library if that fails. 3) Format SMIL differently, using code from klinker instead of what we've pieced together. 4) Pull per-carrier MMS media constraints from the XML config files in the klinker library, instead of hardcoding it at 280kb. Hopefully this is an improvement, but given that MMS is involved, it will probably make things worse instead.
318 lines
12 KiB
Java
318 lines
12 KiB
Java
/**
|
|
* Copyright (C) 2011 Whisper Systems
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.thoughtcrime.securesms.sms;
|
|
|
|
import android.content.Context;
|
|
import android.util.Log;
|
|
import android.util.Pair;
|
|
|
|
import org.thoughtcrime.securesms.ApplicationContext;
|
|
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
|
import org.thoughtcrime.securesms.crypto.MasterSecretUnion;
|
|
import org.thoughtcrime.securesms.database.DatabaseFactory;
|
|
import org.thoughtcrime.securesms.database.EncryptingSmsDatabase;
|
|
import org.thoughtcrime.securesms.database.MmsDatabase;
|
|
import org.thoughtcrime.securesms.database.NotInDirectoryException;
|
|
import org.thoughtcrime.securesms.database.SmsDatabase;
|
|
import org.thoughtcrime.securesms.database.TextSecureDirectory;
|
|
import org.thoughtcrime.securesms.database.ThreadDatabase;
|
|
import org.thoughtcrime.securesms.database.model.MessageRecord;
|
|
import org.thoughtcrime.securesms.jobs.MmsSendJob;
|
|
import org.thoughtcrime.securesms.jobs.PushGroupSendJob;
|
|
import org.thoughtcrime.securesms.jobs.PushMediaSendJob;
|
|
import org.thoughtcrime.securesms.jobs.PushTextSendJob;
|
|
import org.thoughtcrime.securesms.jobs.SmsSendJob;
|
|
import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
|
|
import org.thoughtcrime.securesms.push.AccountManagerFactory;
|
|
import org.thoughtcrime.securesms.recipients.Recipient;
|
|
import org.thoughtcrime.securesms.recipients.Recipients;
|
|
import org.thoughtcrime.securesms.service.ExpiringMessageManager;
|
|
import org.thoughtcrime.securesms.util.GroupUtil;
|
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
|
import org.thoughtcrime.securesms.util.Util;
|
|
import org.whispersystems.jobqueue.JobManager;
|
|
import org.whispersystems.libsignal.util.guava.Optional;
|
|
import org.whispersystems.signalservice.api.SignalServiceAccountManager;
|
|
import org.whispersystems.signalservice.api.push.ContactTokenDetails;
|
|
import org.whispersystems.signalservice.api.util.InvalidNumberException;
|
|
|
|
import java.io.IOException;
|
|
|
|
import org.thoughtcrime.securesms.mms.MmsException;
|
|
|
|
public class MessageSender {
|
|
|
|
private static final String TAG = MessageSender.class.getSimpleName();
|
|
|
|
public static long send(final Context context,
|
|
final MasterSecret masterSecret,
|
|
final OutgoingTextMessage message,
|
|
final long threadId,
|
|
final boolean forceSms,
|
|
final SmsDatabase.InsertListener insertListener)
|
|
{
|
|
EncryptingSmsDatabase database = DatabaseFactory.getEncryptingSmsDatabase(context);
|
|
Recipients recipients = message.getRecipients();
|
|
boolean keyExchange = message.isKeyExchange();
|
|
|
|
long allocatedThreadId;
|
|
|
|
if (threadId == -1) {
|
|
allocatedThreadId = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipients);
|
|
} else {
|
|
allocatedThreadId = threadId;
|
|
}
|
|
|
|
long messageId = database.insertMessageOutbox(new MasterSecretUnion(masterSecret), allocatedThreadId,
|
|
message, forceSms, System.currentTimeMillis(), insertListener);
|
|
|
|
sendTextMessage(context, recipients, forceSms, keyExchange, messageId, message.getExpiresIn());
|
|
|
|
return allocatedThreadId;
|
|
}
|
|
|
|
public static long send(final Context context,
|
|
final MasterSecret masterSecret,
|
|
final OutgoingMediaMessage message,
|
|
final long threadId,
|
|
final boolean forceSms,
|
|
final SmsDatabase.InsertListener insertListener)
|
|
{
|
|
try {
|
|
ThreadDatabase threadDatabase = DatabaseFactory.getThreadDatabase(context);
|
|
MmsDatabase database = DatabaseFactory.getMmsDatabase(context);
|
|
|
|
long allocatedThreadId;
|
|
|
|
if (threadId == -1) {
|
|
allocatedThreadId = threadDatabase.getThreadIdFor(message.getRecipients(), message.getDistributionType());
|
|
} else {
|
|
allocatedThreadId = threadId;
|
|
}
|
|
|
|
Recipients recipients = message.getRecipients();
|
|
long messageId = database.insertMessageOutbox(new MasterSecretUnion(masterSecret), message, allocatedThreadId, forceSms, insertListener);
|
|
|
|
sendMediaMessage(context, masterSecret, recipients, forceSms, messageId, message.getExpiresIn());
|
|
|
|
return allocatedThreadId;
|
|
} catch (MmsException e) {
|
|
Log.w(TAG, e);
|
|
return threadId;
|
|
}
|
|
}
|
|
|
|
public static void resendGroupMessage(Context context, MasterSecret masterSecret, MessageRecord messageRecord, long filterRecipientId) {
|
|
if (!messageRecord.isMms()) throw new AssertionError("Not Group");
|
|
|
|
Recipients recipients = DatabaseFactory.getMmsAddressDatabase(context).getRecipientsForId(messageRecord.getId());
|
|
sendGroupPush(context, recipients, messageRecord.getId(), filterRecipientId);
|
|
}
|
|
|
|
public static void resend(Context context, MasterSecret masterSecret, MessageRecord messageRecord) {
|
|
try {
|
|
long messageId = messageRecord.getId();
|
|
boolean forceSms = messageRecord.isForcedSms();
|
|
boolean keyExchange = messageRecord.isKeyExchange();
|
|
long expiresIn = messageRecord.getExpiresIn();
|
|
|
|
if (messageRecord.isMms()) {
|
|
Recipients recipients = DatabaseFactory.getMmsAddressDatabase(context).getRecipientsForId(messageId);
|
|
sendMediaMessage(context, masterSecret, recipients, forceSms, messageId, expiresIn);
|
|
} else {
|
|
Recipients recipients = messageRecord.getRecipients();
|
|
sendTextMessage(context, recipients, forceSms, keyExchange, messageId, expiresIn);
|
|
}
|
|
} catch (MmsException e) {
|
|
Log.w(TAG, e);
|
|
}
|
|
}
|
|
|
|
private static void sendMediaMessage(Context context, MasterSecret masterSecret,
|
|
Recipients recipients, boolean forceSms,
|
|
long messageId, long expiresIn)
|
|
throws MmsException
|
|
{
|
|
if (!forceSms && isSelfSend(context, recipients)) {
|
|
sendMediaSelf(context, masterSecret, messageId, expiresIn);
|
|
} else if (isGroupPushSend(recipients)) {
|
|
sendGroupPush(context, recipients, messageId, -1);
|
|
} else if (!forceSms && isPushMediaSend(context, recipients)) {
|
|
sendMediaPush(context, recipients, messageId);
|
|
} else {
|
|
sendMms(context, messageId);
|
|
}
|
|
}
|
|
|
|
private static void sendTextMessage(Context context, Recipients recipients,
|
|
boolean forceSms, boolean keyExchange,
|
|
long messageId, long expiresIn)
|
|
{
|
|
if (!forceSms && isSelfSend(context, recipients)) {
|
|
sendTextSelf(context, messageId, expiresIn);
|
|
} else if (!forceSms && isPushTextSend(context, recipients, keyExchange)) {
|
|
sendTextPush(context, recipients, messageId);
|
|
} else {
|
|
sendSms(context, recipients, messageId);
|
|
}
|
|
}
|
|
|
|
private static void sendTextSelf(Context context, long messageId, long expiresIn) {
|
|
EncryptingSmsDatabase database = DatabaseFactory.getEncryptingSmsDatabase(context);
|
|
|
|
database.markAsSent(messageId, true);
|
|
|
|
Pair<Long, Long> messageAndThreadId = database.copyMessageInbox(messageId);
|
|
database.markAsPush(messageAndThreadId.first);
|
|
|
|
if (expiresIn > 0) {
|
|
ExpiringMessageManager expiringMessageManager = ApplicationContext.getInstance(context).getExpiringMessageManager();
|
|
|
|
database.markExpireStarted(messageId);
|
|
expiringMessageManager.scheduleDeletion(messageId, false, expiresIn);
|
|
}
|
|
}
|
|
|
|
private static void sendMediaSelf(Context context, MasterSecret masterSecret,
|
|
long messageId, long expiresIn)
|
|
throws MmsException
|
|
{
|
|
ExpiringMessageManager expiringMessageManager = ApplicationContext.getInstance(context).getExpiringMessageManager();
|
|
MmsDatabase database = DatabaseFactory.getMmsDatabase(context);
|
|
|
|
database.markAsSent(messageId, true);
|
|
database.copyMessageInbox(masterSecret, messageId);
|
|
|
|
if (expiresIn > 0) {
|
|
database.markExpireStarted(messageId);
|
|
expiringMessageManager.scheduleDeletion(messageId, true, expiresIn);
|
|
}
|
|
}
|
|
|
|
private static void sendTextPush(Context context, Recipients recipients, long messageId) {
|
|
JobManager jobManager = ApplicationContext.getInstance(context).getJobManager();
|
|
jobManager.add(new PushTextSendJob(context, messageId, recipients.getPrimaryRecipient().getNumber()));
|
|
}
|
|
|
|
private static void sendMediaPush(Context context, Recipients recipients, long messageId) {
|
|
JobManager jobManager = ApplicationContext.getInstance(context).getJobManager();
|
|
jobManager.add(new PushMediaSendJob(context, messageId, recipients.getPrimaryRecipient().getNumber()));
|
|
}
|
|
|
|
private static void sendGroupPush(Context context, Recipients recipients, long messageId, long filterRecipientId) {
|
|
JobManager jobManager = ApplicationContext.getInstance(context).getJobManager();
|
|
jobManager.add(new PushGroupSendJob(context, messageId, recipients.getPrimaryRecipient().getNumber(), filterRecipientId));
|
|
}
|
|
|
|
private static void sendSms(Context context, Recipients recipients, long messageId) {
|
|
JobManager jobManager = ApplicationContext.getInstance(context).getJobManager();
|
|
jobManager.add(new SmsSendJob(context, messageId, recipients.getPrimaryRecipient().getName()));
|
|
}
|
|
|
|
private static void sendMms(Context context, long messageId) {
|
|
JobManager jobManager = ApplicationContext.getInstance(context).getJobManager();
|
|
jobManager.add(new MmsSendJob(context, messageId));
|
|
}
|
|
|
|
private static boolean isPushTextSend(Context context, Recipients recipients, boolean keyExchange) {
|
|
try {
|
|
if (!TextSecurePreferences.isPushRegistered(context)) {
|
|
return false;
|
|
}
|
|
|
|
if (keyExchange) {
|
|
return false;
|
|
}
|
|
|
|
Recipient recipient = recipients.getPrimaryRecipient();
|
|
String destination = Util.canonicalizeNumber(context, recipient.getNumber());
|
|
|
|
return isPushDestination(context, destination);
|
|
} catch (InvalidNumberException e) {
|
|
Log.w(TAG, e);
|
|
return false;
|
|
}
|
|
}
|
|
|
|
private static boolean isPushMediaSend(Context context, Recipients recipients) {
|
|
try {
|
|
if (!TextSecurePreferences.isPushRegistered(context)) {
|
|
return false;
|
|
}
|
|
|
|
if (recipients.getRecipientsList().size() > 1) {
|
|
return false;
|
|
}
|
|
|
|
Recipient recipient = recipients.getPrimaryRecipient();
|
|
String destination = Util.canonicalizeNumber(context, recipient.getNumber());
|
|
|
|
return isPushDestination(context, destination);
|
|
} catch (InvalidNumberException e) {
|
|
Log.w(TAG, e);
|
|
return false;
|
|
}
|
|
}
|
|
|
|
private static boolean isGroupPushSend(Recipients recipients) {
|
|
return GroupUtil.isEncodedGroup(recipients.getPrimaryRecipient().getNumber());
|
|
}
|
|
|
|
private static boolean isSelfSend(Context context, Recipients recipients) {
|
|
if (!TextSecurePreferences.isPushRegistered(context)) {
|
|
return false;
|
|
}
|
|
|
|
if (!recipients.isSingleRecipient()) {
|
|
return false;
|
|
}
|
|
|
|
if (recipients.isGroupRecipient()) {
|
|
return false;
|
|
}
|
|
|
|
return Util.isOwnNumber(context, recipients.getPrimaryRecipient().getNumber());
|
|
}
|
|
|
|
private static boolean isPushDestination(Context context, String destination) {
|
|
TextSecureDirectory directory = TextSecureDirectory.getInstance(context);
|
|
|
|
try {
|
|
return directory.isSecureTextSupported(destination);
|
|
} catch (NotInDirectoryException e) {
|
|
try {
|
|
SignalServiceAccountManager accountManager = AccountManagerFactory.createManager(context);
|
|
Optional<ContactTokenDetails> registeredUser = accountManager.getContact(destination);
|
|
|
|
if (!registeredUser.isPresent()) {
|
|
registeredUser = Optional.of(new ContactTokenDetails());
|
|
registeredUser.get().setNumber(destination);
|
|
directory.setNumber(registeredUser.get(), false);
|
|
return false;
|
|
} else {
|
|
registeredUser.get().setNumber(destination);
|
|
directory.setNumber(registeredUser.get(), true);
|
|
return true;
|
|
}
|
|
} catch (IOException e1) {
|
|
Log.w(TAG, e1);
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|