kopia lustrzana https://github.com/ryukoposting/Signal-Android
Add story boolean to envelope proto.
Alex Hart
Cody Henthorne
rodzic
9e094dfc2b
commit
9dd96148d1
|
|
@ -92,7 +92,8 @@ public class PushDatabase extends Database {
|
|||
cursor.getLong(cursor.getColumnIndexOrThrow(SERVER_DELIVERED_TIMESTAMP)),
|
||||
cursor.getString(cursor.getColumnIndexOrThrow(SERVER_GUID)),
|
||||
"",
|
||||
true);
|
||||
true,
|
||||
false);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
Log.w(TAG, e);
|
||||
|
|
@ -173,7 +174,8 @@ public class PushDatabase extends Database {
|
|||
serverDeliveredTimestamp,
|
||||
serverGuid,
|
||||
"",
|
||||
true);
|
||||
true,
|
||||
false);
|
||||
} catch (IOException e) {
|
||||
throw new AssertionError(e);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -219,7 +219,8 @@ public class SignalServiceMessageReceiver {
|
|||
messageResult.getServerDeliveredTimestamp(),
|
||||
entity.getServerUuid(),
|
||||
entity.getDestinationUuid(),
|
||||
entity.isUrgent());
|
||||
entity.isUrgent(),
|
||||
entity.isStory());
|
||||
} else {
|
||||
envelope = new SignalServiceEnvelope(entity.getType(),
|
||||
entity.getTimestamp(),
|
||||
|
|
@ -228,7 +229,8 @@ public class SignalServiceMessageReceiver {
|
|||
messageResult.getServerDeliveredTimestamp(),
|
||||
entity.getServerUuid(),
|
||||
entity.getDestinationUuid(),
|
||||
entity.isUrgent());
|
||||
entity.isUrgent(),
|
||||
entity.isStory());
|
||||
}
|
||||
|
||||
callback.onMessage(envelope);
|
||||
|
|
|
|||
|
|
@ -64,7 +64,8 @@ public class SignalServiceEnvelope {
|
|||
long serverDeliveredTimestamp,
|
||||
String uuid,
|
||||
String destinationUuid,
|
||||
boolean urgent)
|
||||
boolean urgent,
|
||||
boolean story)
|
||||
{
|
||||
Envelope.Builder builder = Envelope.newBuilder()
|
||||
.setType(Envelope.Type.valueOf(type))
|
||||
|
|
@ -72,7 +73,8 @@ public class SignalServiceEnvelope {
|
|||
.setTimestamp(timestamp)
|
||||
.setServerTimestamp(serverReceivedTimestamp)
|
||||
.setDestinationUuid(destinationUuid)
|
||||
.setUrgent(urgent);
|
||||
.setUrgent(urgent)
|
||||
.setStory(story);
|
||||
|
||||
if (sender.isPresent()) {
|
||||
builder.setSourceUuid(sender.get().getServiceId().toString());
|
||||
|
|
@ -97,14 +99,16 @@ public class SignalServiceEnvelope {
|
|||
long serverDeliveredTimestamp,
|
||||
String uuid,
|
||||
String destinationUuid,
|
||||
boolean urgent)
|
||||
boolean urgent,
|
||||
boolean story)
|
||||
{
|
||||
Envelope.Builder builder = Envelope.newBuilder()
|
||||
.setType(Envelope.Type.valueOf(type))
|
||||
.setTimestamp(timestamp)
|
||||
.setServerTimestamp(serverReceivedTimestamp)
|
||||
.setDestinationUuid(destinationUuid)
|
||||
.setUrgent(urgent);
|
||||
.setUrgent(urgent)
|
||||
.setStory(story);
|
||||
|
||||
if (uuid != null) {
|
||||
builder.setServerGuid(uuid);
|
||||
|
|
@ -245,6 +249,10 @@ public class SignalServiceEnvelope {
|
|||
return envelope.getUrgent();
|
||||
}
|
||||
|
||||
public boolean isStory() {
|
||||
return envelope.getStory();
|
||||
}
|
||||
|
||||
private SignalServiceEnvelopeProto.Builder serializeToProto() {
|
||||
SignalServiceEnvelopeProto.Builder builder = SignalServiceEnvelopeProto.newBuilder()
|
||||
.setType(getType())
|
||||
|
|
@ -252,7 +260,8 @@ public class SignalServiceEnvelope {
|
|||
.setTimestamp(getTimestamp())
|
||||
.setServerReceivedTimestamp(getServerReceivedTimestamp())
|
||||
.setServerDeliveredTimestamp(getServerDeliveredTimestamp())
|
||||
.setUrgent(isUrgent());
|
||||
.setUrgent(isUrgent())
|
||||
.setStory(isStory());
|
||||
|
||||
if (getSourceUuid().isPresent()) {
|
||||
builder.setSourceUuid(getSourceUuid().get());
|
||||
|
|
@ -298,6 +307,7 @@ public class SignalServiceEnvelope {
|
|||
proto.getServerDeliveredTimestamp(),
|
||||
proto.getServerGuid(),
|
||||
proto.getDestinationUuid(),
|
||||
proto.getUrgent());
|
||||
proto.getUrgent(),
|
||||
proto.getStory());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,9 @@ public class SignalServiceEnvelopeEntity {
|
|||
@JsonProperty
|
||||
private Boolean urgent;
|
||||
|
||||
@JsonProperty
|
||||
private Boolean story;
|
||||
|
||||
public SignalServiceEnvelopeEntity() {}
|
||||
|
||||
public int getType() {
|
||||
|
|
@ -93,4 +96,8 @@ public class SignalServiceEnvelopeEntity {
|
|||
public boolean isUrgent() {
|
||||
return urgent == null || urgent;
|
||||
}
|
||||
|
||||
public boolean isStory() {
|
||||
return story != null && story;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ message SignalServiceEnvelopeProto {
|
|||
optional string serverGuid = 10;
|
||||
optional string destinationUuid = 11;
|
||||
optional bool urgent = 12 [default = true];
|
||||
optional bool story = 13;
|
||||
}
|
||||
|
||||
message MetadataProto {
|
||||
|
|
|
|||
|
|
@ -35,7 +35,8 @@ message Envelope {
|
|||
optional uint64 serverTimestamp = 10;
|
||||
optional bool urgent = 14 [default = true];
|
||||
reserved /*updatedPni*/ 15; // Not used presently, may be used in the future
|
||||
// NEXT ID: 16
|
||||
optional bool story = 16;
|
||||
// NEXT ID: 17
|
||||
}
|
||||
|
||||
message Content {
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue