Drop the legacy message and relay fields from message entities

service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java

@@ -198,10 +198,6 @@ public class MessageController {
         contentLength += message.getContent().length();
       }
 
-      if (!Util.isEmpty(message.getBody())) {
-        contentLength += message.getBody().length();
-      }
-
       validateContentLength(contentLength, userAgent);
       validateEnvelopeType(message.getType(), userAgent);
     }
@@ -529,9 +525,7 @@ public class MessageController {
 
     for (final OutgoingMessageEntity message : messageList.getMessages()) {
       size += message.getContent() == null      ? 0 : message.getContent().length;
-      size += message.getMessage() == null      ? 0 : message.getMessage().length;
       size += Util.isEmpty(message.getSource()) ? 0 : message.getSource().length();
-      size += Util.isEmpty(message.getRelay())  ? 0 : message.getRelay().length();
     }
 
     return size;
@@ -582,7 +576,6 @@ public class MessageController {
       String userAgentString)
       throws NoSuchUserException {
     try {
-      Optional<byte[]> messageBody = getMessageBody(incomingMessage);
       Optional<byte[]> messageContent = getMessageContent(incomingMessage);
       Envelope.Builder messageBuilder = Envelope.newBuilder();
 
@@ -619,11 +612,6 @@ public class MessageController {
               .setSourceUuid(authenticatedAccount.getAccount().getUuid().toString())
               .setSourceDevice((int) authenticatedAccount.getAuthenticatedDevice().getId()));
 
-      messageBody.ifPresent(bytes -> {
-        Metrics.counter(LEGACY_MESSAGE_SENT_COUNTER).increment();
-        messageBuilder.setLegacyMessage(ByteString.copyFrom(messageBody.get()));
-      });
-
       messageContent.ifPresent(bytes -> messageBuilder.setContent(ByteString.copyFrom(bytes)));
 
       messageSender.sendMessage(destinationAccount, destinationDevice, messageBuilder.build(), online);
@@ -798,17 +786,6 @@ public class MessageController {
     }
   }
 
-  private Optional<byte[]> getMessageBody(IncomingMessage message) {
-    if (Util.isEmpty(message.getBody())) return Optional.empty();
-
-    try {
-      return Optional.of(Base64.getDecoder().decode(message.getBody()));
-    } catch (IllegalArgumentException e) {
-      logger.debug("Bad B64", e);
-      return Optional.empty();
-    }
-  }
-
   private Optional<byte[]> getMessageContent(IncomingMessage message) {
     if (Util.isEmpty(message.getContent())) return Optional.empty();
 

service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessage.java

@@ -21,15 +21,9 @@ public class IncomingMessage {
   @JsonProperty
   private final int destinationRegistrationId;
 
-  @JsonProperty
-  private final String body;
-
   @JsonProperty
   private final String content;
 
-  @JsonProperty
-  private final String relay;
-
   @JsonProperty
   private long timestamp; // deprecated
 
@@ -39,34 +33,22 @@ public class IncomingMessage {
       @JsonProperty("destination") final String destination,
       @JsonProperty("destinationDeviceId") final long destinationDeviceId,
       @JsonProperty("destinationRegistrationId") final int destinationRegistrationId,
-      @JsonProperty("body") final String body,
-      @JsonProperty("content") final String content,
-      @JsonProperty("relay") final String relay) {
+      @JsonProperty("content") final String content) {
     this.type = type;
     this.destination = destination;
     this.destinationDeviceId = destinationDeviceId;
     this.destinationRegistrationId = destinationRegistrationId;
-    this.body = body;
     this.content = content;
-    this.relay = relay;
   }
 
   public String getDestination() {
     return destination;
   }
 
-  public String getBody() {
-    return body;
-  }
-
   public int getType() {
     return type;
   }
 
-  public String getRelay() {
-    return relay;
-  }
-
   public long getDestinationDeviceId() {
     return destinationDeviceId;
   }

service/src/main/java/org/whispersystems/textsecuregcm/entities/OutgoingMessageEntity.java

@@ -15,38 +15,32 @@ public class OutgoingMessageEntity {
 
   private final UUID guid;
   private final int type;
-  private final String relay;
   private final long timestamp;
   private final String source;
   private final UUID sourceUuid;
   private final int sourceDevice;
   private final UUID destinationUuid;
-  private final byte[] message;
   private final byte[] content;
   private final long serverTimestamp;
 
   @JsonCreator
   public OutgoingMessageEntity(@JsonProperty("guid") final UUID guid,
       @JsonProperty("type") final int type,
-      @JsonProperty("relay") final String relay,
       @JsonProperty("timestamp") final long timestamp,
       @JsonProperty("source") final String source,
       @JsonProperty("sourceUuid") final UUID sourceUuid,
       @JsonProperty("sourceDevice") final int sourceDevice,
       @JsonProperty("destinationUuid") final UUID destinationUuid,
-      @JsonProperty("message") final byte[] message,
       @JsonProperty("content") final byte[] content,
       @JsonProperty("serverTimestamp") final long serverTimestamp)
   {
     this.guid            = guid;
     this.type            = type;
-    this.relay           = relay;
     this.timestamp       = timestamp;
     this.source          = source;
     this.sourceUuid      = sourceUuid;
     this.sourceDevice    = sourceDevice;
     this.destinationUuid = destinationUuid;
-    this.message         = message;
     this.content         = content;
     this.serverTimestamp = serverTimestamp;
   }
@@ -59,10 +53,6 @@ public class OutgoingMessageEntity {
     return type;
   }
 
-  public String getRelay() {
-    return relay;
-  }
-
   public long getTimestamp() {
     return timestamp;
   }
@@ -83,10 +73,6 @@ public class OutgoingMessageEntity {
     return destinationUuid;
   }
 
-  public byte[] getMessage() {
-    return message;
-  }
-
   public byte[] getContent() {
     return content;
   }
@@ -105,18 +91,15 @@ public class OutgoingMessageEntity {
             sourceDevice == that.sourceDevice &&
             serverTimestamp == that.serverTimestamp &&
             guid.equals(that.guid) &&
-            Objects.equals(relay, that.relay) &&
             Objects.equals(source, that.source) &&
             Objects.equals(sourceUuid, that.sourceUuid) &&
             destinationUuid.equals(that.destinationUuid) &&
-            Arrays.equals(message, that.message) &&
             Arrays.equals(content, that.content);
   }
 
   @Override
   public int hashCode() {
-    int result = Objects.hash(guid, type, relay, timestamp, source, sourceUuid, sourceDevice, destinationUuid, serverTimestamp);
-    result = 31 * result + Arrays.hashCode(message);
+    int result = Objects.hash(guid, type, timestamp, source, sourceUuid, sourceDevice, destinationUuid, serverTimestamp);
     result = 31 * result + Arrays.hashCode(content);
     return result;
   }

service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java

@@ -380,13 +380,11 @@ public class MessagesCache extends RedisClusterPubSubAdapter<String, String> imp
     return new OutgoingMessageEntity(
         envelope.hasServerGuid() ? UUID.fromString(envelope.getServerGuid()) : null,
         envelope.getType().getNumber(),
-        envelope.getRelay(),
         envelope.getTimestamp(),
         envelope.getSource(),
         envelope.hasSourceUuid() ? UUID.fromString(envelope.getSourceUuid()) : null,
         envelope.getSourceDevice(),
         envelope.hasDestinationUuid() ? UUID.fromString(envelope.getDestinationUuid()) : null,
-        envelope.hasLegacyMessage() ? envelope.getLegacyMessage().toByteArray() : null,
         envelope.hasContent() ? envelope.getContent().toByteArray() : null,
         envelope.hasServerTimestamp() ? envelope.getServerTimestamp() : 0);
   }

service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDb.java

@@ -41,13 +41,11 @@ public class MessagesDynamoDb extends AbstractDynamoDbStore {
   private static final String LOCAL_INDEX_MESSAGE_UUID_KEY_SORT = "U";
 
   private static final String KEY_TYPE = "T";
-  private static final String KEY_RELAY = "R";
   private static final String KEY_TIMESTAMP = "TS";
   private static final String KEY_SOURCE = "SN";
   private static final String KEY_SOURCE_UUID = "SU";
   private static final String KEY_SOURCE_DEVICE = "SD";
   private static final String KEY_DESTINATION_UUID = "DU";
-  private static final String KEY_MESSAGE = "M";
   private static final String KEY_CONTENT = "C";
   private static final String KEY_TTL = "E";
 
@@ -90,9 +88,6 @@ public class MessagesDynamoDb extends AbstractDynamoDbStore {
 
       item.put(KEY_DESTINATION_UUID, AttributeValues.fromUUID(UUID.fromString(message.getDestinationUuid())));
 
-      if (message.hasRelay() && message.getRelay().length() > 0) {
-        item.put(KEY_RELAY, AttributeValues.fromString(message.getRelay()));
-      }
       if (message.hasSource()) {
         item.put(KEY_SOURCE, AttributeValues.fromString(message.getSource()));
       }
@@ -102,9 +97,6 @@ public class MessagesDynamoDb extends AbstractDynamoDbStore {
       if (message.hasSourceDevice()) {
         item.put(KEY_SOURCE_DEVICE, AttributeValues.fromInt(message.getSourceDevice()));
       }
-      if (message.hasLegacyMessage()) {
-        item.put(KEY_MESSAGE, AttributeValues.fromByteArray(message.getLegacyMessage().toByteArray()));
-      }
       if (message.hasContent()) {
         item.put(KEY_CONTENT, AttributeValues.fromByteArray(message.getContent().toByteArray()));
       }
@@ -223,15 +215,13 @@ public class MessagesDynamoDb extends AbstractDynamoDbStore {
     final SortKey sortKey = convertSortKey(message.get(KEY_SORT).b().asByteArray());
     final UUID messageUuid = convertLocalIndexMessageUuidSortKey(message.get(LOCAL_INDEX_MESSAGE_UUID_KEY_SORT).b().asByteArray());
     final int type = AttributeValues.getInt(message, KEY_TYPE, 0);
-    final String relay = AttributeValues.getString(message, KEY_RELAY, null);
     final long timestamp = AttributeValues.getLong(message, KEY_TIMESTAMP, 0L);
     final String source = AttributeValues.getString(message, KEY_SOURCE, null);
     final UUID sourceUuid = AttributeValues.getUUID(message, KEY_SOURCE_UUID, null);
     final int sourceDevice = AttributeValues.getInt(message, KEY_SOURCE_DEVICE, 0);
     final UUID destinationUuid = AttributeValues.getUUID(message, KEY_DESTINATION_UUID, null);
-    final byte[] messageBytes = AttributeValues.getByteArray(message, KEY_MESSAGE, null);
     final byte[] content = AttributeValues.getByteArray(message, KEY_CONTENT, null);
-    return new OutgoingMessageEntity(messageUuid, type, relay, timestamp, source, sourceUuid, sourceDevice, destinationUuid, messageBytes, content, sortKey.getServerTimestamp());
+    return new OutgoingMessageEntity(messageUuid, type, timestamp, source, sourceUuid, sourceDevice, destinationUuid, content, sortKey.getServerTimestamp());
   }
 
   private void deleteRowsMatchingQuery(AttributeValue partitionKey, QueryRequest querySpec) {

service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java

@@ -326,18 +326,10 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
           }
         }
 
-        if (message.getMessage() != null) {
-          builder.setLegacyMessage(ByteString.copyFrom(message.getMessage()));
-        }
-
         if (message.getContent() != null) {
           builder.setContent(ByteString.copyFrom(message.getContent()));
         }
 
-        if (message.getRelay() != null && !message.getRelay().isEmpty()) {
-          builder.setRelay(message.getRelay());
-        }
-
         builder.setDestinationUuid(message.getDestinationUuid().toString());
 
         builder.setServerGuid(message.getGuid().toString());