TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-21 18:48:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Beginning of libtextsecure refactor.

Browse Source 
1) Break out appropriate components.

2) Switch the incoming pipeline from SendReceiveService to
   the JobManager.
This commit is contained in:
Moxie Marlinspike
2014-11-03 15:16:04 -08:00
parent 4cab657ebe
commit a3f1d9cdfd
152 changed files with 3521 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
View File

@@ -5,6 +5,8 @@ import android.os.Parcelable;
import android.telephony.SmsMessage;
import org.thoughtcrime.securesms.util.GroupUtil;
import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.messages.TextSecureGroup;
import org.whispersystems.textsecure.push.IncomingPushMessage;
import org.whispersystems.textsecure.storage.RecipientDevice;
@@ -50,19 +52,21 @@ public class IncomingTextMessage implements Parcelable {
this.push = false;
}
public IncomingTextMessage(IncomingPushMessage message, String encodedBody, GroupContext group) {
public IncomingTextMessage(String sender, int senderDeviceId, long sentTimestampMillis,
String encodedBody, Optional<TextSecureGroup> group)
{
this.message = encodedBody;
this.sender = message.getSource();
this.senderDeviceId = message.getSourceDevice();
this.sender = sender;
this.senderDeviceId = senderDeviceId;
this.protocol = 31337;
this.serviceCenterAddress = "GCM";
this.replyPathPresent = true;
this.pseudoSubject = "";
this.sentTimestampMillis = message.getTimestampMillis();
this.sentTimestampMillis = sentTimestampMillis;
this.push = true;
if (group != null && group.hasId()) {
this.groupId = GroupUtil.getEncodedId(group.getId().toByteArray());
if (group.isPresent()) {
this.groupId = GroupUtil.getEncodedId(group.get().getGroupId());
} else {
this.groupId = null;
}

11
src/org/thoughtcrime/securesms/sms/MessageSender.java
View File

@@ -21,25 +21,20 @@ import android.content.Intent;
import android.util.Log;
import android.util.Pair;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.EncryptingSmsDatabase;
import org.thoughtcrime.securesms.database.MmsDatabase;
import org.thoughtcrime.securesms.database.MmsSmsColumns;
import org.thoughtcrime.securesms.mms.IncomingMediaMessage;
import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.thoughtcrime.securesms.service.SendReceiveService;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.textsecure.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.service.SendReceiveService;
import org.whispersystems.textsecure.push.IncomingPushMessage;
import org.whispersystems.textsecure.push.PushMessageProtos;
import org.whispersystems.textsecure.util.InvalidNumberException;
import java.util.List;
import ws.com.google.android.mms.MmsException;
import ws.com.google.android.mms.pdu.RetrieveConf;
public class MessageSender {

27
src/org/thoughtcrime/securesms/sms/MultipartSmsMessageHandler.java
View File

@@ -26,27 +26,28 @@ import java.util.HashMap;
public class MultipartSmsMessageHandler {
private final HashMap<String, MultipartSmsTransportMessageFragments> partialMessages =
new HashMap<String, MultipartSmsTransportMessageFragments>();
private static final String TAG = MultipartSmsMessageHandler.class.getSimpleName();
private final HashMap<String, MultipartSmsTransportMessageFragments> partialMessages = new HashMap<>();
private IncomingTextMessage processMultipartMessage(MultipartSmsTransportMessage message) {
Log.w("MultipartSmsMessageHandler", "Processing multipart message...");
Log.w("MultipartSmsMessageHandler", "Multipart Count: " + message.getMultipartCount());
Log.w("MultipartSmsMessageHandler", "Multipart ID: " + message.getIdentifier());
Log.w("MultipartSmsMessageHandler", "Multipart Key: " + message.getKey());
Log.w(TAG, "Processing multipart message...");
Log.w(TAG, "Multipart Count: " + message.getMultipartCount());
Log.w(TAG, "Multipart ID: " + message.getIdentifier());
Log.w(TAG, "Multipart Key: " + message.getKey());
MultipartSmsTransportMessageFragments container = partialMessages.get(message.getKey());
Log.w("MultipartSmsMessageHandler", "Found multipart container: " + container);
Log.w(TAG, "Found multipart container: " + container);
if (container == null || container.getSize() != message.getMultipartCount() || container.isExpired()) {
Log.w("MultipartSmsMessageHandler", "Constructing new container...");
Log.w(TAG, "Constructing new container...");
container = new MultipartSmsTransportMessageFragments(message.getMultipartCount());
partialMessages.put(message.getKey(), container);
}
container.add(message);
Log.w("MultipartSmsMessageHandler", "Filled buffer at index: " + message.getMultipartIndex());
Log.w(TAG, "Filled buffer at index: " + message.getMultipartIndex());
if (!container.isComplete())
return null;
@@ -64,7 +65,7 @@ public class MultipartSmsMessageHandler {
}
private IncomingTextMessage processSinglePartMessage(MultipartSmsTransportMessage message) {
Log.w("MultipartSmsMessageHandler", "Processing single part message...");
Log.w(TAG, "Processing single part message...");
String strippedMessage = Base64.encodeBytesWithoutPadding(message.getStrippedMessage());
if (message.getWireType() == MultipartSmsTransportMessage.WIRETYPE_KEY) {
@@ -78,7 +79,7 @@ public class MultipartSmsMessageHandler {
}
}
public IncomingTextMessage processPotentialMultipartMessage(IncomingTextMessage message) {
public synchronized IncomingTextMessage processPotentialMultipartMessage(IncomingTextMessage message) {
try {
MultipartSmsTransportMessage transportMessage = new MultipartSmsTransportMessage(message);
@@ -86,12 +87,12 @@ public class MultipartSmsMessageHandler {
else if (transportMessage.isSinglePart()) return processSinglePartMessage(transportMessage);
else return processMultipartMessage(transportMessage);
} catch (IOException e) {
Log.w("MultipartSmsMessageHandler", e);
Log.w(TAG, e);
return message;
}
}
public ArrayList<String> divideMessage(OutgoingTextMessage message) {
public synchronized ArrayList<String> divideMessage(OutgoingTextMessage message) {
String number = message.getRecipients().getPrimaryRecipient().getNumber();
byte identifier = MultipartSmsIdentifier.getInstance().getIdForRecipient(number);
return MultipartSmsTransportMessage.getEncoded(message, identifier);