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

wip

Browse Source
This commit is contained in:
Moxie Marlinspike
2014-01-14 00:26:43 -08:00
parent 4851a555e7
commit 49daa45dca
19 changed files with 1674 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ public class IncomingTextMessage implements Parcelable {
private final boolean replyPathPresent;
private final String pseudoSubject;
private final long sentTimestampMillis;
private final String groupId;
public IncomingTextMessage(SmsMessage message) {
this.message = message.getDisplayMessageBody();
@@ -38,9 +39,10 @@ public class IncomingTextMessage implements Parcelable {
this.replyPathPresent = message.isReplyPathPresent();
this.pseudoSubject = message.getPseudoSubject();
this.sentTimestampMillis = message.getTimestampMillis();
this.groupId = null;
}
public IncomingTextMessage(IncomingPushMessage message, String encodedBody) {
public IncomingTextMessage(IncomingPushMessage message, String encodedBody, String groupId) {
this.message = encodedBody;
this.sender = message.getSource();
this.protocol = 31337;
@@ -48,6 +50,7 @@ public class IncomingTextMessage implements Parcelable {
this.replyPathPresent = true;
this.pseudoSubject = "";
this.sentTimestampMillis = message.getTimestampMillis();
this.groupId = groupId;
}
public IncomingTextMessage(Parcel in) {
@@ -58,6 +61,7 @@ public class IncomingTextMessage implements Parcelable {
this.replyPathPresent = (in.readInt() == 1);
this.pseudoSubject = in.readString();
this.sentTimestampMillis = in.readLong();
this.groupId = in.readString();
}
public IncomingTextMessage(IncomingTextMessage base, String newBody) {
@@ -68,6 +72,7 @@ public class IncomingTextMessage implements Parcelable {
this.replyPathPresent = base.isReplyPathPresent();
this.pseudoSubject = base.getPseudoSubject();
this.sentTimestampMillis = base.getSentTimestampMillis();
this.groupId = base.getGroupId();
}
public IncomingTextMessage(List<IncomingTextMessage> fragments) {
@@ -84,6 +89,7 @@ public class IncomingTextMessage implements Parcelable {
this.replyPathPresent = fragments.get(0).isReplyPathPresent();
this.pseudoSubject = fragments.get(0).getPseudoSubject();
this.sentTimestampMillis = fragments.get(0).getSentTimestampMillis();
this.groupId = fragments.get(0).getGroupId();
}
public long getSentTimestampMillis() {
@@ -130,6 +136,10 @@ public class IncomingTextMessage implements Parcelable {
return false;
}
public String getGroupId() {
return groupId;
}
@Override
public int describeContents() {
return 0;
@@ -144,5 +154,6 @@ public class IncomingTextMessage implements Parcelable {
out.writeInt(replyPathPresent ? 1 : 0);
out.writeString(pseudoSubject);
out.writeLong(sentTimestampMillis);
out.writeString(groupId);
}
}

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

@@ -116,15 +116,20 @@ public class MessageSender {
SendReq sendRequest, long threadId, int distributionType, boolean secure)
throws MmsException
{
Log.w("MessageSender", "Distribution type: " + distributionType);
String[] recipientsArray = recipients.toNumberStringArray(true);
EncodedStringValue[] encodedNumbers = EncodedStringValue.encodeStrings(recipientsArray);
if (recipients.isSingleRecipient()) {
Log.w("MessageSender", "Single recipient!?");
sendRequest.setTo(encodedNumbers);
} else if (distributionType == ThreadDatabase.DistributionTypes.BROADCAST) {
Log.w("MessageSender", "Broadcast...");
sendRequest.setBcc(encodedNumbers);
} else if (distributionType == ThreadDatabase.DistributionTypes.CONVERSATION) {
sendRequest.setCc(encodedNumbers);
} else if (distributionType == ThreadDatabase.DistributionTypes.CONVERSATION || distributionType == 0) {
Log.w("MessageSender", "Conversation...");
sendRequest.setTo(encodedNumbers);
}
long messageId = DatabaseFactory.getMmsDatabase(context)