TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-27 10:17:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
session-android/src/org/thoughtcrime/securesms/sms/MessageSender.java

123 lines
4.7 KiB
Java
Raw Normal View History

Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
/**
Initial Project Import
2011-12-20 10:20:44 -08:00
* Copyright (C) 2011 Whisper Systems
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
*
Initial Project Import
2011-12-20 10:20:44 -08:00
* 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.
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
*
Initial Project Import
2011-12-20 10:20:44 -08:00
* 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;
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
import android.content.Context;
import android.content.Intent;
import android.util.Log;
Initial Project Import
2011-12-20 10:20:44 -08:00
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.DatabaseFactory;
First cut at group messaging refactor.
2013-04-25 18:59:49 -07:00
import org.thoughtcrime.securesms.database.ThreadDatabase;
Initial Project Import
2011-12-20 10:20:44 -08:00
import org.thoughtcrime.securesms.mms.SlideDeck;
import org.thoughtcrime.securesms.mms.TextSlide;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.thoughtcrime.securesms.service.SendReceiveService;
Major storage layer refactoring to set the stage for clean GCM. 1) We now try to hand out cursors at a minimum. There has always been a fairly clean insertion layer that handles encrypting message bodies, but the process of decrypting message bodies has always been less than ideal. Here we introduce a "Reader" interface that will decrypt message bodies when appropriate and return objects that encapsulate record state. No more MessageDisplayHelper. The MmsSmsDatabase interface is also more sane. 2) We finally rid ourselves of the technical debt associated with TextSecure's initial usage of the default SMS DB. In that world, we weren't able to use anything other than the default "Inbox, Outbox, Sent" types to describe a message, and had to overload the message content itself with a set of local "prefixes" to describe what it was (encrypted, asymetric encrypted, remote encrypted, a key exchange, procssed key exchange), and so on. This includes a major schema update that transforms the "type" field into a bitmask that describes everything that used to be encoded in a prefix, and prefixes have been completely eliminated from the system. No more Prefix.java 3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and hopefully more clear as to what's going on. The next step is to remove what we can from SmsTransportDetails and genericize that interface for a GCM equivalent.
2013-04-20 12:22:04 -07:00
import java.util.List;
Initial Project Import
2011-12-20 10:20:44 -08:00
import ws.com.google.android.mms.ContentType;
import ws.com.google.android.mms.MmsException;
import ws.com.google.android.mms.pdu.EncodedStringValue;
import ws.com.google.android.mms.pdu.PduBody;
import ws.com.google.android.mms.pdu.SendReq;
public class MessageSender {
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
public static long sendMms(Context context, MasterSecret masterSecret, Recipients recipients,
First cut at group messaging refactor.
2013-04-25 18:59:49 -07:00
long threadId, SlideDeck slideDeck, String message, int distributionType,
boolean forcePlaintext)
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
throws MmsException
Initial Project Import
2011-12-20 10:20:44 -08:00
{
if (threadId == -1)
First cut at group messaging refactor.
2013-04-25 18:59:49 -07:00
threadId = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipients, distributionType);
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
Initial Project Import
2011-12-20 10:20:44 -08:00
if (message.trim().length() > 0)
slideDeck.addSlide(new TextSlide(context, message));
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
SendReq sendRequest = new SendReq();
PduBody body = slideDeck.toPduBody();
Initial Project Import
2011-12-20 10:20:44 -08:00
sendRequest.setDate(System.currentTimeMillis() / 1000L);
sendRequest.setBody(body);
sendRequest.setContentType(ContentType.MULTIPART_MIXED.getBytes());
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
First cut at group messaging refactor.
2013-04-25 18:59:49 -07:00
// Recipients secureRecipients = recipients.getSecureSessionRecipients(context);
// Recipients insecureRecipients = recipients.getInsecureSessionRecipients(context);
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
First cut at group messaging refactor.
2013-04-25 18:59:49 -07:00
// for (Recipient secureRecipient : secureRecipients.getRecipientsList()) {
// sendMms(context, new Recipients(secureRecipient), masterSecret,
// sendRequest, threadId, !forcePlaintext);
// }
//
// if (!insecureRecipients.isEmpty()) {
// sendMms(context, insecureRecipients, masterSecret, sendRequest, threadId, false);
// }
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
First cut at group messaging refactor.
2013-04-25 18:59:49 -07:00
sendMms(context, recipients, masterSecret, sendRequest, threadId, distributionType, false);
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
Initial Project Import
2011-12-20 10:20:44 -08:00
return threadId;
}
Major storage layer refactoring to set the stage for clean GCM. 1) We now try to hand out cursors at a minimum. There has always been a fairly clean insertion layer that handles encrypting message bodies, but the process of decrypting message bodies has always been less than ideal. Here we introduce a "Reader" interface that will decrypt message bodies when appropriate and return objects that encapsulate record state. No more MessageDisplayHelper. The MmsSmsDatabase interface is also more sane. 2) We finally rid ourselves of the technical debt associated with TextSecure's initial usage of the default SMS DB. In that world, we weren't able to use anything other than the default "Inbox, Outbox, Sent" types to describe a message, and had to overload the message content itself with a set of local "prefixes" to describe what it was (encrypted, asymetric encrypted, remote encrypted, a key exchange, procssed key exchange), and so on. This includes a major schema update that transforms the "type" field into a bitmask that describes everything that used to be encoded in a prefix, and prefixes have been completely eliminated from the system. No more Prefix.java 3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and hopefully more clear as to what's going on. The next step is to remove what we can from SmsTransportDetails and genericize that interface for a GCM equivalent.
2013-04-20 12:22:04 -07:00
public static long send(Context context, MasterSecret masterSecret,
OutgoingTextMessage message, long threadId)
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
{
Initial Project Import
2011-12-20 10:20:44 -08:00
if (threadId == -1)
Major storage layer refactoring to set the stage for clean GCM. 1) We now try to hand out cursors at a minimum. There has always been a fairly clean insertion layer that handles encrypting message bodies, but the process of decrypting message bodies has always been less than ideal. Here we introduce a "Reader" interface that will decrypt message bodies when appropriate and return objects that encapsulate record state. No more MessageDisplayHelper. The MmsSmsDatabase interface is also more sane. 2) We finally rid ourselves of the technical debt associated with TextSecure's initial usage of the default SMS DB. In that world, we weren't able to use anything other than the default "Inbox, Outbox, Sent" types to describe a message, and had to overload the message content itself with a set of local "prefixes" to describe what it was (encrypted, asymetric encrypted, remote encrypted, a key exchange, procssed key exchange), and so on. This includes a major schema update that transforms the "type" field into a bitmask that describes everything that used to be encoded in a prefix, and prefixes have been completely eliminated from the system. No more Prefix.java 3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and hopefully more clear as to what's going on. The next step is to remove what we can from SmsTransportDetails and genericize that interface for a GCM equivalent.
2013-04-20 12:22:04 -07:00
threadId = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(message.getRecipients());
Initial Project Import
2011-12-20 10:20:44 -08:00
Major storage layer refactoring to set the stage for clean GCM. 1) We now try to hand out cursors at a minimum. There has always been a fairly clean insertion layer that handles encrypting message bodies, but the process of decrypting message bodies has always been less than ideal. Here we introduce a "Reader" interface that will decrypt message bodies when appropriate and return objects that encapsulate record state. No more MessageDisplayHelper. The MmsSmsDatabase interface is also more sane. 2) We finally rid ourselves of the technical debt associated with TextSecure's initial usage of the default SMS DB. In that world, we weren't able to use anything other than the default "Inbox, Outbox, Sent" types to describe a message, and had to overload the message content itself with a set of local "prefixes" to describe what it was (encrypted, asymetric encrypted, remote encrypted, a key exchange, procssed key exchange), and so on. This includes a major schema update that transforms the "type" field into a bitmask that describes everything that used to be encoded in a prefix, and prefixes have been completely eliminated from the system. No more Prefix.java 3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and hopefully more clear as to what's going on. The next step is to remove what we can from SmsTransportDetails and genericize that interface for a GCM equivalent.
2013-04-20 12:22:04 -07:00
List<Long> messageIds = DatabaseFactory.getEncryptingSmsDatabase(context)
.insertMessageOutbox(masterSecret, threadId, message);
Initial Project Import
2011-12-20 10:20:44 -08:00
Major storage layer refactoring to set the stage for clean GCM. 1) We now try to hand out cursors at a minimum. There has always been a fairly clean insertion layer that handles encrypting message bodies, but the process of decrypting message bodies has always been less than ideal. Here we introduce a "Reader" interface that will decrypt message bodies when appropriate and return objects that encapsulate record state. No more MessageDisplayHelper. The MmsSmsDatabase interface is also more sane. 2) We finally rid ourselves of the technical debt associated with TextSecure's initial usage of the default SMS DB. In that world, we weren't able to use anything other than the default "Inbox, Outbox, Sent" types to describe a message, and had to overload the message content itself with a set of local "prefixes" to describe what it was (encrypted, asymetric encrypted, remote encrypted, a key exchange, procssed key exchange), and so on. This includes a major schema update that transforms the "type" field into a bitmask that describes everything that used to be encoded in a prefix, and prefixes have been completely eliminated from the system. No more Prefix.java 3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and hopefully more clear as to what's going on. The next step is to remove what we can from SmsTransportDetails and genericize that interface for a GCM equivalent.
2013-04-20 12:22:04 -07:00
for (long messageId : messageIds) {
Initial Project Import
2011-12-20 10:20:44 -08:00
Log.w("SMSSender", "Got message id for new message: " + messageId);
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
Intent intent = new Intent(SendReceiveService.SEND_SMS_ACTION, null,
context, SendReceiveService.class);
Initial Project Import
2011-12-20 10:20:44 -08:00
intent.putExtra("message_id", messageId);
context.startService(intent);
}
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
Initial Project Import
2011-12-20 10:20:44 -08:00
return threadId;
}
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
private static void sendMms(Context context, Recipients recipients, MasterSecret masterSecret,
First cut at group messaging refactor.
2013-04-25 18:59:49 -07:00
SendReq sendRequest, long threadId, int distributionType, boolean secure)
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
throws MmsException
{
Scrub recipients for MMS messages so they'll be valid PLMN.
2013-03-14 15:59:28 -07:00
String[] recipientsArray = recipients.toNumberStringArray(true);
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
EncodedStringValue[] encodedNumbers = EncodedStringValue.encodeStrings(recipientsArray);
First cut at group messaging refactor.
2013-04-25 18:59:49 -07:00
if (recipients.isSingleRecipient()) {
sendRequest.setTo(encodedNumbers);
} else if (distributionType == ThreadDatabase.DistributionTypes.BROADCAST) {
sendRequest.setBcc(encodedNumbers);
} else if (distributionType == ThreadDatabase.DistributionTypes.CONVERSATION) {
sendRequest.setCc(encodedNumbers);
}
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
Major storage layer refactoring to set the stage for clean GCM. 1) We now try to hand out cursors at a minimum. There has always been a fairly clean insertion layer that handles encrypting message bodies, but the process of decrypting message bodies has always been less than ideal. Here we introduce a "Reader" interface that will decrypt message bodies when appropriate and return objects that encapsulate record state. No more MessageDisplayHelper. The MmsSmsDatabase interface is also more sane. 2) We finally rid ourselves of the technical debt associated with TextSecure's initial usage of the default SMS DB. In that world, we weren't able to use anything other than the default "Inbox, Outbox, Sent" types to describe a message, and had to overload the message content itself with a set of local "prefixes" to describe what it was (encrypted, asymetric encrypted, remote encrypted, a key exchange, procssed key exchange), and so on. This includes a major schema update that transforms the "type" field into a bitmask that describes everything that used to be encoded in a prefix, and prefixes have been completely eliminated from the system. No more Prefix.java 3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and hopefully more clear as to what's going on. The next step is to remove what we can from SmsTransportDetails and genericize that interface for a GCM equivalent.
2013-04-20 12:22:04 -07:00
long messageId = DatabaseFactory.getMmsDatabase(context)
.insertMessageOutbox(masterSecret, sendRequest, threadId, secure);
Fix "Group Threads" so that messages are encrypted when possible. 1) Change the MessageSender logic so that individual SMS messages are encrypted whenever there is a secure session, unless the UI explicitly specifies otherwise. 2) Change the MMS logic so that messages to a recipient with a secure session are all sent individually, instead of including those recipients into the batch plaintext message.
2012-10-21 17:41:44 -07:00
Intent intent = new Intent(SendReceiveService.SEND_MMS_ACTION, null,
context, SendReceiveService.class);
intent.putExtra("message_id", messageId);
context.startService(intent);
}
Initial Project Import
2011-12-20 10:20:44 -08:00
}
Reference in New Issue Copy Permalink