MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Gotta stub out message field for delivery receipts w/ old clients 

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-06-25 11:00:59 -07:00
parent 18a96a445b
commit a5ffd47935
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protobuf/TextSecure.proto
View File

@ -33,7 +33,7 @@ message Envelope {
optional uint32 sourceDevice = 7; optional uint32 sourceDevice = 7;
optional string relay = 3; optional string relay = 3;
optional uint64 timestamp = 5; optional uint64 timestamp = 5;
optional bytes legacyMessage = 6; // Contains an encrypted DataMessage optional bytes legacyMessage = 6; // Contains an encrypted DataMessage XXX -- Remove after 10/01/15
optional bytes content = 8; // Contains an encrypted Content optional bytes content = 8; // Contains an encrypted Content
} }

13
src/main/java/org/whispersystems/textsecuregcm/storage/Messages.java
View File

@ -66,13 +66,22 @@ public abstract class Messages {
public OutgoingMessageEntity map(int i, ResultSet resultSet, StatementContext statementContext) public OutgoingMessageEntity map(int i, ResultSet resultSet, StatementContext statementContext)
throws SQLException throws SQLException
{ {
int type = resultSet.getInt(TYPE);
byte[] legacyMessage = resultSet.getBytes(MESSAGE);
if (type == Envelope.Type.RECEIPT_VALUE && legacyMessage == null) {
/// XXX - REMOVE AFTER 10/01/15
legacyMessage = new byte[0];
}
return new OutgoingMessageEntity(resultSet.getLong(ID), return new OutgoingMessageEntity(resultSet.getLong(ID),
resultSet.getInt(TYPE), type,
resultSet.getString(RELAY), resultSet.getString(RELAY),
resultSet.getLong(TIMESTAMP), resultSet.getLong(TIMESTAMP),
resultSet.getString(SOURCE), resultSet.getString(SOURCE),
resultSet.getInt(SOURCE_DEVICE), resultSet.getInt(SOURCE_DEVICE),
resultSet.getBytes(MESSAGE), legacyMessage,
resultSet.getBytes(CONTENT)); resultSet.getBytes(CONTENT));
} }
} }