diff --git a/src/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java b/src/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java index 8afded126f..1d01cdec2b 100644 --- a/src/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java +++ b/src/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java @@ -20,15 +20,11 @@ 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.groupAction = -1; - this.groupActionArguments = null; + this.headers = retreived.getPduHeaders(); + this.body = retreived.getBody(); + this.groupId = null; } public IncomingMediaMessage(MasterSecret masterSecret, String localNumber, @@ -39,19 +35,16 @@ public class IncomingMediaMessage { this.body = new PduBody(); if (messageContent.hasGroup()) { - this.groupId = GroupUtil.getEncodedId(messageContent.getGroup().getId().toByteArray()); - this.groupAction = messageContent.getGroup().getType().getNumber(); - this.groupActionArguments = GroupUtil.serializeArguments(messageContent.getGroup()); + this.groupId = GroupUtil.getEncodedId(messageContent.getGroup().getId().toByteArray()); } else { - this.groupId = null; - this.groupAction = -1; - this.groupActionArguments = null; + this.groupId = null; } this.headers.setEncodedStringValue(new EncodedStringValue(message.getSource()), PduHeaders.FROM); this.headers.appendEncodedStringValue(new EncodedStringValue(localNumber), PduHeaders.TO); this.headers.setLongInteger(message.getTimestampMillis() / 1000, PduHeaders.DATE); + if (!org.whispersystems.textsecure.util.Util.isEmpty(messageContent.getBody())) { PduPart text = new PduPart(); text.setData(Util.toIsoBytes(messageContent.getBody())); @@ -97,12 +90,4 @@ public class IncomingMediaMessage { (headers.getEncodedStringValues(PduHeaders.TO) != null && headers.getEncodedStringValues(PduHeaders.TO).length > 1); } - - public int getGroupAction() { - return groupAction; - } - - public String getGroupActionArguments() { - return groupActionArguments; - } }