mirror of
https://github.com/oxen-io/session-android.git
synced 2025-10-20 14:54:09 +00: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.
This commit is contained in:
Moxie Marlinspike
@@ -74,11 +74,11 @@ public class KeyCachingService extends Service {
|
||||
foregroundService();
|
||||
broadcastNewSecret();
|
||||
startTimeoutIfAppropriate();
|
||||
DecryptingQueue.schedulePendingDecrypts(this, masterSecret);
|
||||
|
||||
new Thread() {
|
||||
@Override
|
||||
public void run() {
|
||||
DecryptingQueue.schedulePendingDecrypts(KeyCachingService.this, masterSecret);
|
||||
MessageNotifier.updateNotification(KeyCachingService.this, masterSecret);
|
||||
}
|
||||
}.start();
|
||||
|
||||
@@ -63,12 +63,12 @@ public class MmsDownloader extends MmscProcessor {
|
||||
private void handleDownloadMmsAction(DownloadItem item) {
|
||||
if (!isConnectivityPossible()) {
|
||||
Log.w("MmsDownloader", "No MMS connectivity available!");
|
||||
DatabaseFactory.getMmsDatabase(context).markDownloadState(item.getMessageId(), MmsDatabase.Types.DOWNLOAD_NO_CONNECTIVITY);
|
||||
DatabaseFactory.getMmsDatabase(context).markDownloadState(item.getMessageId(), MmsDatabase.Status.DOWNLOAD_NO_CONNECTIVITY);
|
||||
toastHandler.makeToast(context.getString(R.string.MmsDownloader_no_connectivity_available_for_mms_download_try_again_later));
|
||||
return;
|
||||
}
|
||||
|
||||
DatabaseFactory.getMmsDatabase(context).markDownloadState(item.getMessageId(), MmsDatabase.Types.DOWNLOAD_CONNECTING);
|
||||
DatabaseFactory.getMmsDatabase(context).markDownloadState(item.getMessageId(), MmsDatabase.Status.DOWNLOAD_CONNECTING);
|
||||
|
||||
if (item.useMmsRadioMode()) downloadMmsWithRadioChange(item);
|
||||
else downloadMms(item);
|
||||
@@ -82,13 +82,7 @@ public class MmsDownloader extends MmscProcessor {
|
||||
|
||||
private void downloadMms(DownloadItem item) {
|
||||
Log.w("MmsDownloadService", "Handling actual MMS download...");
|
||||
MmsDatabase mmsDatabase;
|
||||
|
||||
if (item.getMasterSecret() == null) {
|
||||
mmsDatabase = DatabaseFactory.getMmsDatabase(context);
|
||||
} else {
|
||||
mmsDatabase = DatabaseFactory.getEncryptingMmsDatabase(context, item.getMasterSecret());
|
||||
}
|
||||
MmsDatabase mmsDatabase = DatabaseFactory.getMmsDatabase(context);
|
||||
|
||||
try {
|
||||
RetrieveConf retrieved = MmsDownloadHelper.retrieveMms(context, item.getContentLocation(),
|
||||
@@ -115,12 +109,12 @@ public class MmsDownloader extends MmscProcessor {
|
||||
Log.w("MmsDownloadeR", "Falling back to radio mode and proxy...");
|
||||
scheduleDownloadWithRadioModeAndProxy(item);
|
||||
} else {
|
||||
DatabaseFactory.getMmsDatabase(context).markDownloadState(item.getMessageId(), MmsDatabase.Types.DOWNLOAD_SOFT_FAILURE);
|
||||
DatabaseFactory.getMmsDatabase(context).markDownloadState(item.getMessageId(), MmsDatabase.Status.DOWNLOAD_SOFT_FAILURE);
|
||||
toastHandler.makeToast(context.getString(R.string.MmsDownloader_error_connecting_to_mms_provider));
|
||||
}
|
||||
} catch (MmsException e) {
|
||||
Log.w("MmsDownloader", e);
|
||||
DatabaseFactory.getMmsDatabase(context).markDownloadState(item.getMessageId(), MmsDatabase.Types.DOWNLOAD_HARD_FAILURE);
|
||||
DatabaseFactory.getMmsDatabase(context).markDownloadState(item.getMessageId(), MmsDatabase.Status.DOWNLOAD_HARD_FAILURE);
|
||||
toastHandler.makeToast(context.getString(R.string.MmsDownloader_error_storing_mms));
|
||||
}
|
||||
}
|
||||
@@ -129,13 +123,16 @@ public class MmsDownloader extends MmscProcessor {
|
||||
throws MmsException
|
||||
{
|
||||
if (retrieved.getSubject() != null && WirePrefix.isEncryptedMmsSubject(retrieved.getSubject().getString())) {
|
||||
long messageId = mmsDatabase.insertSecureMessageReceived(retrieved, item.getContentLocation(), item.getThreadId());
|
||||
long messageId = mmsDatabase.insertSecureMessageInbox(item.getMasterSecret(), retrieved,
|
||||
item.getContentLocation(),
|
||||
item.getThreadId());
|
||||
|
||||
if (item.getMasterSecret() != null)
|
||||
DecryptingQueue.scheduleDecryption(context, item.getMasterSecret(), messageId, item.getThreadId(), retrieved);
|
||||
|
||||
} else {
|
||||
mmsDatabase.insertMessageReceived(retrieved, item.getContentLocation(), item.getThreadId());
|
||||
mmsDatabase.insertMessageInbox(item.getMasterSecret(), retrieved, item.getContentLocation(),
|
||||
item.getThreadId());
|
||||
}
|
||||
|
||||
mmsDatabase.delete(item.getMessageId());
|
||||
@@ -158,7 +155,7 @@ public class MmsDownloader extends MmscProcessor {
|
||||
pendingMessages.clear();
|
||||
|
||||
for (DownloadItem item : downloadItems) {
|
||||
DatabaseFactory.getMmsDatabase(context).markDownloadState(item.getMessageId(), MmsDatabase.Types.DOWNLOAD_NO_CONNECTIVITY);
|
||||
DatabaseFactory.getMmsDatabase(context).markDownloadState(item.getMessageId(), MmsDatabase.Status.DOWNLOAD_NO_CONNECTIVITY);
|
||||
}
|
||||
|
||||
toastHandler.makeToast(context
|
||||
|
||||
@@ -54,15 +54,9 @@ public class MmsReceiver {
|
||||
GenericPdu pdu = parser.parse();
|
||||
|
||||
if (pdu.getMessageType() == PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND) {
|
||||
MmsDatabase database;
|
||||
|
||||
if (masterSecret != null)
|
||||
database = DatabaseFactory.getEncryptingMmsDatabase(context, masterSecret);
|
||||
else
|
||||
database = DatabaseFactory.getMmsDatabase(context);
|
||||
|
||||
long messageId = database.insertMessageReceived((NotificationInd)pdu);
|
||||
long threadId = database.getThreadIdForMessage(messageId);
|
||||
MmsDatabase database = DatabaseFactory.getMmsDatabase(context);
|
||||
long messageId = database.insertMessageInbox((NotificationInd)pdu);
|
||||
long threadId = database.getThreadIdForMessage(messageId);
|
||||
|
||||
MessageNotifier.updateNotification(context, masterSecret, threadId);
|
||||
scheduleDownload((NotificationInd)pdu, messageId, threadId);
|
||||
|
||||
@@ -65,7 +65,7 @@ public class MmsSender extends MmscProcessor {
|
||||
if (intent.getAction().equals(SendReceiveService.SEND_MMS_ACTION)) {
|
||||
long messageId = intent.getLongExtra("message_id", -1);
|
||||
boolean isCdma = ((TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE)).getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA;
|
||||
MmsDatabase database = DatabaseFactory.getEncryptingMmsDatabase(context, masterSecret);
|
||||
MmsDatabase database = DatabaseFactory.getMmsDatabase(context);
|
||||
|
||||
try {
|
||||
List<SendReq> sendRequests = getOutgoingMessages(masterSecret, messageId);
|
||||
@@ -107,14 +107,14 @@ public class MmsSender extends MmscProcessor {
|
||||
|
||||
private void sendMmsMessage(SendItem item) {
|
||||
Log.w("MmsSender", "Sending MMS SendItem...");
|
||||
MmsDatabase db = DatabaseFactory.getEncryptingMmsDatabase(context, item.masterSecret);
|
||||
MmsDatabase db = DatabaseFactory.getMmsDatabase(context);
|
||||
String number = ((TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE)).getLine1Number();
|
||||
long messageId = item.request.getDatabaseMessageId();
|
||||
long messageBox = item.request.getDatabaseMessageBox();
|
||||
SendReq request = item.request;
|
||||
|
||||
|
||||
if (MmsDatabase.Types.isSecureMmsBox(messageBox)) {
|
||||
if (MmsDatabase.Types.isSecureType(messageBox)) {
|
||||
request = getEncryptedMms(item.masterSecret, request, messageId);
|
||||
}
|
||||
|
||||
@@ -151,11 +151,7 @@ public class MmsSender extends MmscProcessor {
|
||||
return;
|
||||
} else {
|
||||
Log.w("MmsSender", "Successful send! " + messageId);
|
||||
if (!MmsDatabase.Types.isSecureMmsBox(messageBox)) {
|
||||
db.markAsSent(messageId, conf.getMessageId(), conf.getResponseStatus());
|
||||
} else {
|
||||
db.markAsSecureSent(messageId, conf.getMessageId(), conf.getResponseStatus());
|
||||
}
|
||||
db.markAsSent(messageId, conf.getMessageId(), conf.getResponseStatus());
|
||||
}
|
||||
} catch (IOException ioe) {
|
||||
Log.w("MmsSender", ioe);
|
||||
@@ -168,14 +164,14 @@ public class MmsSender extends MmscProcessor {
|
||||
private List<SendReq> getOutgoingMessages(MasterSecret masterSecret, long messageId)
|
||||
throws MmsException
|
||||
{
|
||||
MmsDatabase database = DatabaseFactory.getEncryptingMmsDatabase(context, masterSecret);
|
||||
MmsDatabase database = DatabaseFactory.getMmsDatabase(context);
|
||||
List<SendReq> sendRequests;
|
||||
|
||||
if (messageId == -1) {
|
||||
sendRequests = Arrays.asList(database.getOutgoingMessages());
|
||||
sendRequests = Arrays.asList(database.getOutgoingMessages(masterSecret));
|
||||
} else {
|
||||
sendRequests = new ArrayList<SendReq>(1);
|
||||
sendRequests.add(database.getSendRequest(messageId));
|
||||
sendRequests.add(database.getSendRequest(masterSecret, messageId));
|
||||
}
|
||||
|
||||
return sendRequests;
|
||||
|
||||
@@ -27,7 +27,7 @@ import android.util.Log;
|
||||
|
||||
import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
|
||||
import org.thoughtcrime.securesms.protocol.WirePrefix;
|
||||
import org.thoughtcrime.securesms.sms.TextMessage;
|
||||
import org.thoughtcrime.securesms.sms.IncomingTextMessage;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -77,12 +77,12 @@ public class SmsListener extends BroadcastReceiver {
|
||||
return bodyBuilder.toString();
|
||||
}
|
||||
|
||||
private ArrayList<TextMessage> getAsTextMessages(Intent intent) {
|
||||
private ArrayList<IncomingTextMessage> getAsTextMessages(Intent intent) {
|
||||
Object[] pdus = (Object[])intent.getExtras().get("pdus");
|
||||
ArrayList<TextMessage> messages = new ArrayList<TextMessage>(pdus.length);
|
||||
ArrayList<IncomingTextMessage> messages = new ArrayList<IncomingTextMessage>(pdus.length);
|
||||
|
||||
for (int i=0;i<pdus.length;i++)
|
||||
messages.add(new TextMessage(SmsMessage.createFromPdu((byte[])pdus[i])));
|
||||
messages.add(new IncomingTextMessage(SmsMessage.createFromPdu((byte[])pdus[i])));
|
||||
|
||||
return messages;
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.util.Log;
|
||||
import android.util.Pair;
|
||||
|
||||
import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
|
||||
import org.thoughtcrime.securesms.crypto.DecryptingQueue;
|
||||
@@ -30,14 +31,16 @@ import org.thoughtcrime.securesms.crypto.KeyExchangeProcessor;
|
||||
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
||||
import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
|
||||
import org.thoughtcrime.securesms.database.DatabaseFactory;
|
||||
import org.thoughtcrime.securesms.database.EncryptingSmsDatabase;
|
||||
import org.thoughtcrime.securesms.database.SmsDatabase;
|
||||
import org.thoughtcrime.securesms.notifications.MessageNotifier;
|
||||
import org.thoughtcrime.securesms.protocol.Prefix;
|
||||
import org.thoughtcrime.securesms.protocol.WirePrefix;
|
||||
import org.thoughtcrime.securesms.recipients.Recipient;
|
||||
import org.thoughtcrime.securesms.sms.IncomingKeyExchangeMessage;
|
||||
import org.thoughtcrime.securesms.sms.IncomingTextMessage;
|
||||
import org.thoughtcrime.securesms.sms.MultipartMessageHandler;
|
||||
import org.thoughtcrime.securesms.sms.TextMessage;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class SmsReceiver {
|
||||
|
||||
@@ -49,80 +52,63 @@ public class SmsReceiver {
|
||||
this.context = context;
|
||||
}
|
||||
|
||||
private String assembleSecureMessageFragments(String sender, String messageBody) {
|
||||
String localPrefix;
|
||||
|
||||
if (WirePrefix.isEncryptedMessage(messageBody)) {
|
||||
localPrefix = Prefix.ASYMMETRIC_ENCRYPT;
|
||||
private IncomingTextMessage assembleMessageFragments(List<IncomingTextMessage> messages) {
|
||||
IncomingTextMessage message = new IncomingTextMessage(messages);
|
||||
|
||||
if (WirePrefix.isEncryptedMessage(message.getMessageBody()) || WirePrefix.isKeyExchange(message.getMessageBody())) {
|
||||
return multipartMessageHandler.processPotentialMultipartMessage(message);
|
||||
} else {
|
||||
localPrefix = Prefix.KEY_EXCHANGE;
|
||||
return message;
|
||||
}
|
||||
|
||||
Log.w("SMSReceiverService", "Calculated local prefix for message: " + messageBody + " - Local Prefix: " + localPrefix);
|
||||
|
||||
messageBody = messageBody.substring(WirePrefix.PREFIX_SIZE);
|
||||
|
||||
Log.w("SMSReceiverService", "Parsed off wire prefix: " + messageBody);
|
||||
|
||||
if (!multipartMessageHandler.isManualTransport(messageBody))
|
||||
return localPrefix + messageBody;
|
||||
else
|
||||
return multipartMessageHandler.processPotentialMultipartMessage(localPrefix, sender, messageBody);
|
||||
|
||||
}
|
||||
|
||||
private String assembleMessageFragments(TextMessage[] messages) {
|
||||
StringBuilder body = new StringBuilder();
|
||||
private Pair<Long, Long> storeSecureMessage(MasterSecret masterSecret, IncomingTextMessage message) {
|
||||
Pair<Long, Long> messageAndThreadId = DatabaseFactory.getEncryptingSmsDatabase(context)
|
||||
.insertMessageInbox(masterSecret, message);
|
||||
|
||||
for (TextMessage message : messages) {
|
||||
body.append(message.getMessage());
|
||||
if (masterSecret != null) {
|
||||
DecryptingQueue.scheduleDecryption(context, masterSecret, messageAndThreadId.first,
|
||||
message.getSender(), message.getMessageBody(),
|
||||
message.isSecureMessage());
|
||||
}
|
||||
|
||||
String messageBody = body.toString();
|
||||
return messageAndThreadId;
|
||||
}
|
||||
|
||||
if (WirePrefix.isEncryptedMessage(messageBody) || WirePrefix.isKeyExchange(messageBody)) {
|
||||
return assembleSecureMessageFragments(messages[0].getSender(), messageBody);
|
||||
private Pair<Long, Long> storeStandardMessage(MasterSecret masterSecret, IncomingTextMessage message) {
|
||||
EncryptingSmsDatabase encryptingDatabase = DatabaseFactory.getEncryptingSmsDatabase(context);
|
||||
SmsDatabase plaintextDatabase = DatabaseFactory.getSmsDatabase(context);
|
||||
|
||||
if (masterSecret != null) {
|
||||
return encryptingDatabase.insertMessageInbox(masterSecret, message);
|
||||
} else if (MasterSecretUtil.hasAsymmericMasterSecret(context)) {
|
||||
return encryptingDatabase.insertMessageInbox(MasterSecretUtil.getAsymmetricMasterSecret(context, null), message);
|
||||
} else {
|
||||
return messageBody;
|
||||
return plaintextDatabase.insertMessageInbox(message);
|
||||
}
|
||||
}
|
||||
|
||||
private long storeSecureMessage(MasterSecret masterSecret, TextMessage message, String messageBody) {
|
||||
long messageId = DatabaseFactory.getSmsDatabase(context).insertSecureMessageReceived(message, messageBody);
|
||||
Log.w("SmsReceiver", "Inserted secure message received: " + messageId);
|
||||
|
||||
if (masterSecret != null)
|
||||
DecryptingQueue.scheduleDecryption(context, masterSecret, messageId, message.getSender(), messageBody);
|
||||
|
||||
return messageId;
|
||||
}
|
||||
|
||||
private long storeStandardMessage(MasterSecret masterSecret, TextMessage message, String messageBody) {
|
||||
if (masterSecret != null) return DatabaseFactory.getEncryptingSmsDatabase(context).insertMessageReceived(masterSecret, message, messageBody);
|
||||
else if (MasterSecretUtil.hasAsymmericMasterSecret(context)) return DatabaseFactory.getEncryptingSmsDatabase(context).insertMessageReceived(MasterSecretUtil.getAsymmetricMasterSecret(context, null), message, messageBody);
|
||||
else return DatabaseFactory.getSmsDatabase(context).insertMessageReceived(message, messageBody);
|
||||
}
|
||||
|
||||
private long storeKeyExchangeMessage(MasterSecret masterSecret, TextMessage message, String messageBody) {
|
||||
private Pair<Long, Long> storeKeyExchangeMessage(MasterSecret masterSecret,
|
||||
IncomingKeyExchangeMessage message)
|
||||
{
|
||||
if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(ApplicationPreferencesActivity.AUTO_KEY_EXCHANGE_PREF, true)) {
|
||||
try {
|
||||
Recipient recipient = new Recipient(null, message.getSender(), null, null);
|
||||
KeyExchangeMessage keyExchangeMessage = new KeyExchangeMessage(messageBody);
|
||||
KeyExchangeMessage keyExchangeMessage = new KeyExchangeMessage(message.getMessageBody());
|
||||
KeyExchangeProcessor processor = new KeyExchangeProcessor(context, masterSecret, recipient);
|
||||
|
||||
Log.w("SmsReceiver", "Received key with fingerprint: " + keyExchangeMessage.getPublicKey().getFingerprint());
|
||||
|
||||
if (processor.isStale(keyExchangeMessage)) {
|
||||
messageBody = messageBody.substring(Prefix.KEY_EXCHANGE.length());
|
||||
messageBody = Prefix.STALE_KEY_EXCHANGE + messageBody;
|
||||
message.setStale(true);
|
||||
} else if (!processor.hasCompletedSession() || processor.hasSameSessionIdentity(keyExchangeMessage)) {
|
||||
messageBody = messageBody.substring(Prefix.KEY_EXCHANGE.length());
|
||||
messageBody = Prefix.PROCESSED_KEY_EXCHANGE + messageBody;
|
||||
long messageId = storeStandardMessage(masterSecret, message, messageBody);
|
||||
long threadId = DatabaseFactory.getSmsDatabase(context).getThreadIdForMessage(messageId);
|
||||
message.setProcessed(true);
|
||||
|
||||
processor.processKeyExchangeMessage(keyExchangeMessage, threadId);
|
||||
return messageId;
|
||||
Pair<Long, Long> messageAndThreadId = storeStandardMessage(masterSecret, message);
|
||||
processor.processKeyExchangeMessage(keyExchangeMessage, messageAndThreadId.second);
|
||||
|
||||
return messageAndThreadId;
|
||||
}
|
||||
} catch (InvalidVersionException e) {
|
||||
Log.w("SmsReceiver", e);
|
||||
@@ -131,41 +117,22 @@ public class SmsReceiver {
|
||||
}
|
||||
}
|
||||
|
||||
return storeStandardMessage(masterSecret, message, messageBody);
|
||||
return storeStandardMessage(masterSecret, message);
|
||||
}
|
||||
|
||||
private long storeMessage(MasterSecret masterSecret, TextMessage message, String messageBody) {
|
||||
if (messageBody.startsWith(Prefix.ASYMMETRIC_ENCRYPT)) {
|
||||
return storeSecureMessage(masterSecret, message, messageBody);
|
||||
} else if (messageBody.startsWith(Prefix.KEY_EXCHANGE)) {
|
||||
return storeKeyExchangeMessage(masterSecret, message, messageBody);
|
||||
} else {
|
||||
return storeStandardMessage(masterSecret, message, messageBody);
|
||||
}
|
||||
private Pair<Long, Long> storeMessage(MasterSecret masterSecret, IncomingTextMessage message) {
|
||||
if (message.isSecureMessage()) return storeSecureMessage(masterSecret, message);
|
||||
else if (message.isKeyExchange()) return storeKeyExchangeMessage(masterSecret, (IncomingKeyExchangeMessage)message);
|
||||
else return storeStandardMessage(masterSecret, message);
|
||||
}
|
||||
|
||||
// private SmsMessage[] parseMessages(Bundle bundle) {
|
||||
// Object[] pdus = (Object[])bundle.get("pdus");
|
||||
// SmsMessage[] messages = new SmsMessage[pdus.length];
|
||||
//
|
||||
// for (int i=0;i<pdus.length;i++)
|
||||
// messages[i] = SmsMessage.createFromPdu((byte[])pdus[i]);
|
||||
//
|
||||
// return messages;
|
||||
// }
|
||||
|
||||
private void handleReceiveMessage(MasterSecret masterSecret, Intent intent) {
|
||||
ArrayList<TextMessage> messagesList = intent.getExtras().getParcelableArrayList("text_messages");
|
||||
TextMessage[] messages = messagesList.toArray(new TextMessage[0]);
|
||||
// Bundle bundle = intent.getExtras();
|
||||
// SmsMessage[] messages = parseMessages(bundle);
|
||||
String message = assembleMessageFragments(messages);
|
||||
List<IncomingTextMessage> messagesList = intent.getExtras().getParcelableArrayList("text_messages");
|
||||
IncomingTextMessage message = assembleMessageFragments(messagesList);
|
||||
|
||||
if (message != null) {
|
||||
long messageId = storeMessage(masterSecret, messages[0], message);
|
||||
long threadId = DatabaseFactory.getSmsDatabase(context).getThreadIdForMessage(messageId);
|
||||
|
||||
MessageNotifier.updateNotification(context, masterSecret, threadId);
|
||||
Pair<Long, Long> messageAndThreadId = storeMessage(masterSecret, message);
|
||||
MessageNotifier.updateNotification(context, masterSecret, messageAndThreadId.second);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -17,45 +17,30 @@
|
||||
package org.thoughtcrime.securesms.service;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.PendingIntent;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.database.Cursor;
|
||||
import android.net.Uri;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.telephony.SmsManager;
|
||||
import android.telephony.SmsMessage;
|
||||
import android.util.Log;
|
||||
|
||||
import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
|
||||
import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.crypto.MasterCipher;
|
||||
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
||||
import org.thoughtcrime.securesms.crypto.SessionCipher;
|
||||
import org.thoughtcrime.securesms.database.DatabaseFactory;
|
||||
import org.thoughtcrime.securesms.database.SmsDatabase;
|
||||
import org.thoughtcrime.securesms.gcm.OptimizingTransport;
|
||||
import org.thoughtcrime.securesms.database.EncryptingSmsDatabase;
|
||||
import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
|
||||
import org.thoughtcrime.securesms.notifications.MessageNotifier;
|
||||
import org.thoughtcrime.securesms.protocol.KeyExchangeWirePrefix;
|
||||
import org.thoughtcrime.securesms.protocol.Prefix;
|
||||
import org.thoughtcrime.securesms.protocol.SecureMessageWirePrefix;
|
||||
import org.thoughtcrime.securesms.protocol.WirePrefix;
|
||||
import org.thoughtcrime.securesms.recipients.Recipient;
|
||||
import org.thoughtcrime.securesms.recipients.Recipients;
|
||||
import org.thoughtcrime.securesms.service.SendReceiveService.ToastHandler;
|
||||
import org.thoughtcrime.securesms.sms.MultipartMessageHandler;
|
||||
import org.thoughtcrime.securesms.sms.SmsTransportDetails;
|
||||
import org.thoughtcrime.securesms.util.InvalidMessageException;
|
||||
import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
|
||||
import org.thoughtcrime.securesms.transport.UniversalTransport;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class SmsSender {
|
||||
|
||||
private final MultipartMessageHandler multipartMessageHandler = new MultipartMessageHandler();
|
||||
private final Set<Long> pendingMessages = new HashSet<Long>();
|
||||
private final Set<Long> pendingMessages = new HashSet<Long>();
|
||||
|
||||
private final Context context;
|
||||
private final ToastHandler toastHandler;
|
||||
@@ -76,53 +61,43 @@ public class SmsSender {
|
||||
}
|
||||
|
||||
private void handleSendMessage(MasterSecret masterSecret, Intent intent) {
|
||||
MasterCipher masterCipher = new MasterCipher(masterSecret);
|
||||
long messageId = intent.getLongExtra("message_id", -1);
|
||||
Cursor c = null;
|
||||
long messageId = intent.getLongExtra("message_id", -1);
|
||||
UniversalTransport transport = new UniversalTransport(context, masterSecret);
|
||||
EncryptingSmsDatabase database = DatabaseFactory.getEncryptingSmsDatabase(context);
|
||||
|
||||
Log.w("SMSSenderService", "Processing outgoing message: " + messageId);
|
||||
EncryptingSmsDatabase.Reader reader = null;
|
||||
SmsMessageRecord record;
|
||||
|
||||
Log.w("SmsSender", "Sending message: " + messageId);
|
||||
|
||||
try {
|
||||
if (messageId == -1) c = DatabaseFactory.getSmsDatabase(context).getOutgoingMessages();
|
||||
else c = DatabaseFactory.getSmsDatabase(context).getMessage(messageId);
|
||||
if (messageId != -1) reader = database.getMessage(masterSecret, messageId);
|
||||
else reader = database.getOutgoingMessages(masterSecret);
|
||||
|
||||
if (c != null && c.moveToFirst()) {
|
||||
do {
|
||||
messageId = c.getLong(c.getColumnIndexOrThrow(SmsDatabase.ID));
|
||||
String body = c.getString(c.getColumnIndexOrThrow(SmsDatabase.BODY));
|
||||
String address = c.getString(c.getColumnIndexOrThrow(SmsDatabase.ADDRESS));
|
||||
String messageText = getClearTextBody(masterCipher, body);
|
||||
long type = c.getLong(c.getColumnIndexOrThrow(SmsDatabase.TYPE));
|
||||
|
||||
if (!SmsDatabase.Types.isPendingMessageType(type))
|
||||
continue;
|
||||
|
||||
if (isSecureMessage(type))
|
||||
messageText = getAsymmetricEncrypt(masterSecret, messageText, address);
|
||||
|
||||
if (!pendingMessages.contains(messageId)) {
|
||||
Log.w("SMSSenderService", "Actually delivering: " + messageId);
|
||||
pendingMessages.add(messageId);
|
||||
deliverTextMessage(address, messageText, messageId, type);
|
||||
}
|
||||
} while (c.moveToNext());
|
||||
while (reader != null && (record = reader.getNext()) != null) {
|
||||
if (!pendingMessages.contains(record.getId())) {
|
||||
pendingMessages.add(record.getId());
|
||||
transport.deliver(record);
|
||||
}
|
||||
}
|
||||
} catch (UndeliverableMessageException ude) {
|
||||
Log.w("SmsSender", ude);
|
||||
DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageId);
|
||||
} finally {
|
||||
if (c != null)
|
||||
c.close();
|
||||
if (reader != null)
|
||||
reader.close();
|
||||
}
|
||||
}
|
||||
|
||||
private void handleSentMessage(Intent intent) {
|
||||
long messageId = intent.getLongExtra("message_id", -1);
|
||||
long type = intent.getLongExtra("type", -1);
|
||||
int result = intent.getIntExtra("ResultCode", -31337);
|
||||
|
||||
Log.w("SMSReceiverService", "Intent resultcode: " + result);
|
||||
Log.w("SMSReceiverService", "Running sent callback: " + messageId + "," + type);
|
||||
Log.w("SMSReceiverService", "Running sent callback: " + messageId);
|
||||
|
||||
if (result == Activity.RESULT_OK) {
|
||||
DatabaseFactory.getSmsDatabase(context).markAsSent(messageId, type);
|
||||
DatabaseFactory.getSmsDatabase(context).markAsSent(messageId);
|
||||
unregisterForRadioChanges();
|
||||
} else if (result == SmsManager.RESULT_ERROR_NO_SERVICE || result == SmsManager.RESULT_ERROR_RADIO_OFF) {
|
||||
toastHandler
|
||||
@@ -143,9 +118,7 @@ public class SmsSender {
|
||||
|
||||
private void handleDeliveredMessage(Intent intent) {
|
||||
long messageId = intent.getLongExtra("message_id", -1);
|
||||
long type = intent.getLongExtra("type", -1);
|
||||
byte[] pdu = intent.getByteArrayExtra("pdu");
|
||||
String format = intent.getStringExtra("format");
|
||||
SmsMessage message = SmsMessage.createFromPdu(pdu);
|
||||
|
||||
if (message == null) {
|
||||
@@ -167,133 +140,7 @@ public class SmsSender {
|
||||
try {
|
||||
context.unregisterReceiver(SystemStateListener.getInstance());
|
||||
} catch (IllegalArgumentException iae) {
|
||||
|
||||
Log.w("SmsSender", iae);
|
||||
}
|
||||
}
|
||||
|
||||
private String getClearTextBody(MasterCipher masterCipher, String body) {
|
||||
if (body.startsWith(Prefix.SYMMETRIC_ENCRYPT)) {
|
||||
try {
|
||||
return masterCipher.decryptBody(body.substring(Prefix.SYMMETRIC_ENCRYPT.length()));
|
||||
} catch (InvalidMessageException e) {
|
||||
return "Error decrypting message.";
|
||||
}
|
||||
} else {
|
||||
return body;
|
||||
}
|
||||
}
|
||||
|
||||
private ArrayList<PendingIntent> constructSentIntents(long messageId, long type, ArrayList<String> messages) {
|
||||
ArrayList<PendingIntent> sentIntents = new ArrayList<PendingIntent>(messages.size());
|
||||
|
||||
for (int i=0;i<messages.size();i++) {
|
||||
Intent pending = new Intent(SendReceiveService.SENT_SMS_ACTION, Uri.parse("custom://" + messageId + System.currentTimeMillis()), context, SmsListener.class);
|
||||
pending.putExtra("type", type);
|
||||
pending.putExtra("message_id", messageId);
|
||||
sentIntents.add(PendingIntent.getBroadcast(context, 0, pending, 0));
|
||||
}
|
||||
|
||||
return sentIntents;
|
||||
}
|
||||
|
||||
private ArrayList<PendingIntent> constructDeliveredIntents(long messageId, long type, ArrayList<String> messages) {
|
||||
if (!PreferenceManager.getDefaultSharedPreferences(context)
|
||||
.getBoolean(ApplicationPreferencesActivity.SMS_DELIVERY_REPORT_PREF, false))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
ArrayList<PendingIntent> deliveredIntents = new ArrayList<PendingIntent>(messages.size());
|
||||
|
||||
for (int i=0;i<messages.size();i++) {
|
||||
Intent pending = new Intent(SendReceiveService.DELIVERED_SMS_ACTION, Uri.parse("custom://" + messageId + System.currentTimeMillis()), context, SmsListener.class);
|
||||
pending.putExtra("type", type);
|
||||
pending.putExtra("message_id", messageId);
|
||||
deliveredIntents.add(PendingIntent.getBroadcast(context, 0, pending, 0));
|
||||
}
|
||||
|
||||
return deliveredIntents;
|
||||
}
|
||||
|
||||
private void deliverGSMTransportTextMessage(String recipient, String text, long messageId, long type) {
|
||||
ArrayList<String> messages = SmsManager.getDefault().divideMessage(text);
|
||||
ArrayList<PendingIntent> sentIntents = constructSentIntents(messageId, type, messages);
|
||||
ArrayList<PendingIntent> deliveredIntents = constructDeliveredIntents(messageId, type, messages);
|
||||
|
||||
// XXX moxie@thoughtcrime.org 1/7/11 -- There's apparently a bug where for some unknown recipients
|
||||
// and messages, this will throw an NPE. I have no idea why, so I'm just catching it and marking
|
||||
// the message as a failure. That way at least it doesn't repeatedly crash every time you start
|
||||
// the app.
|
||||
try {
|
||||
OptimizingTransport.sendMultipartTextMessage(context, recipient, messages, sentIntents, deliveredIntents);
|
||||
//
|
||||
// SmsManager.getDefault().sendMultipartTextMessage(recipient, null, messages, sentIntents, deliveredIntents);
|
||||
} catch (NullPointerException npe) {
|
||||
Log.w("SmsSender", npe);
|
||||
DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageId);
|
||||
}
|
||||
}
|
||||
|
||||
private void deliverSecureTransportTextMessage(String recipient, String text, long messageId, long type) {
|
||||
WirePrefix prefix;
|
||||
|
||||
if (isSecureMessage(type)) {
|
||||
prefix = new SecureMessageWirePrefix();
|
||||
text = text.substring(Prefix.ASYMMETRIC_ENCRYPT.length());
|
||||
} else {
|
||||
prefix = new KeyExchangeWirePrefix();
|
||||
text = text.substring(Prefix.KEY_EXCHANGE.length());
|
||||
}
|
||||
|
||||
if (!multipartMessageHandler.isManualTransport(text)) {
|
||||
deliverGSMTransportTextMessage(recipient, prefix.calculatePrefix(text) + text, messageId, type);
|
||||
return;
|
||||
}
|
||||
|
||||
ArrayList<String> messages = multipartMessageHandler.divideMessage(recipient, text, prefix);
|
||||
ArrayList<PendingIntent> sentIntents = constructSentIntents(messageId, type, messages);
|
||||
ArrayList<PendingIntent> deliveredIntents = constructDeliveredIntents(messageId, type, messages);
|
||||
|
||||
for (int i=0;i<messages.size();i++) {
|
||||
// XXX moxie@thoughtcrime.org 1/7/11 -- There's apparently a bug where for some unknown recipients
|
||||
// and messages, this will throw an NPE. I have no idea why, so I'm just catching it and marking
|
||||
// the message as a failure. That way at least it doesn't repeatedly crash every time you start
|
||||
// the app.
|
||||
try {
|
||||
OptimizingTransport.sendTextMessage(context, recipient, messages.get(i), sentIntents.get(i),
|
||||
deliveredIntents == null ? null : deliveredIntents.get(i));
|
||||
// SmsManager.getDefault().sendTextMessage(recipient, null, messages.get(i), sentIntents.get(i),
|
||||
// deliveredIntents == null ? null : deliveredIntents.get(i));
|
||||
} catch (NullPointerException npe) {
|
||||
Log.w("SmsSender", npe);
|
||||
DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageId);
|
||||
} catch (IllegalArgumentException iae) {
|
||||
Log.w("SmsSender", iae);
|
||||
DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void deliverTextMessage(String recipient, String text, long messageId, long type) {
|
||||
if (!isSecureMessage(type) && !isKeyExchange(text))
|
||||
deliverGSMTransportTextMessage(recipient, text, messageId, type);
|
||||
else
|
||||
deliverSecureTransportTextMessage(recipient, text, messageId, type);
|
||||
}
|
||||
|
||||
private boolean isSecureMessage(long type) {
|
||||
return type == SmsDatabase.Types.ENCRYPTING_TYPE;
|
||||
}
|
||||
|
||||
private boolean isKeyExchange(String messageText) {
|
||||
return messageText.startsWith(Prefix.KEY_EXCHANGE);
|
||||
}
|
||||
|
||||
private String getAsymmetricEncrypt(MasterSecret masterSecret, String body, String address) {
|
||||
synchronized (SessionCipher.CIPHER_LOCK) {
|
||||
SessionCipher cipher = new SessionCipher(context, masterSecret, new Recipient(null, address, null, null), new SmsTransportDetails());
|
||||
return new String(cipher.encryptMessage(body.getBytes()));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user