TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-08 01:23:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display group actions and correctly handle group delivery.

Browse Source
This commit is contained in:
Moxie Marlinspike
2014-02-14 15:59:57 -08:00
parent 7c46f3cbf8
commit 067799be06
26 changed files with 304 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java
View File

@@ -20,11 +20,15 @@ public class IncomingMediaMessage {
private final PduHeaders headers;
private final PduBody body;
private final String groupId;
private final int groupAction;
private final String groupActionArguments;
public IncomingMediaMessage(RetrieveConf retreived) {
this.headers = retreived.getPduHeaders();
this.body = retreived.getBody();
this.groupId = null;
this.headers = retreived.getPduHeaders();
this.body = retreived.getBody();
this.groupId = null;
this.groupAction = -1;
this.groupActionArguments = null;
}
public IncomingMediaMessage(MasterSecret masterSecret, String localNumber,
@@ -35,9 +39,13 @@ public class IncomingMediaMessage {
this.body = new PduBody();
if (messageContent.hasGroup()) {
this.groupId = GroupUtil.getEncodedId(messageContent.getGroup().getId().toByteArray());
this.groupId = GroupUtil.getEncodedId(messageContent.getGroup().getId().toByteArray());
this.groupAction = messageContent.getGroup().getType().getNumber();
this.groupActionArguments = GroupUtil.getActionArgument(messageContent.getGroup());
} else {
this.groupId = null;
this.groupId = null;
this.groupAction = -1;
this.groupActionArguments = null;
}
this.headers.setEncodedStringValue(new EncodedStringValue(message.getSource()), PduHeaders.FROM);
@@ -90,4 +98,11 @@ public class IncomingMediaMessage {
headers.getEncodedStringValues(PduHeaders.TO).length > 1);
}
public int getGroupAction() {
return groupAction;
}
public String getGroupActionArguments() {
return groupActionArguments;
}
}