mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add story boolean to envelope proto.

fork-5.53.8
Alex Hart 2022-09-20 16:04:08 -03:00 zatwierdzone przez Cody Henthorne
rodzic 9e094dfc2b
commit 9dd96148d1
6 zmienionych plików z 34 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java
Wyświetl plik

@ -92,7 +92,8 @@ public class PushDatabase extends Database {
cursor.getLong(cursor.getColumnIndexOrThrow(SERVER_DELIVERED_TIMESTAMP)), cursor.getLong(cursor.getColumnIndexOrThrow(SERVER_DELIVERED_TIMESTAMP)),
cursor.getString(cursor.getColumnIndexOrThrow(SERVER_GUID)), cursor.getString(cursor.getColumnIndexOrThrow(SERVER_GUID)),
"", "",
true); true,
false);
} }
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, e); Log.w(TAG, e);
@ -173,7 +174,8 @@ public class PushDatabase extends Database {
serverDeliveredTimestamp, serverDeliveredTimestamp,
serverGuid, serverGuid,
"", "",
true); true,
false);
} catch (IOException e) { } catch (IOException e) {
throw new AssertionError(e); throw new AssertionError(e);
} }

6
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java
Wyświetl plik

@ -219,7 +219,8 @@ public class SignalServiceMessageReceiver {
messageResult.getServerDeliveredTimestamp(), messageResult.getServerDeliveredTimestamp(),
entity.getServerUuid(), entity.getServerUuid(),
entity.getDestinationUuid(), entity.getDestinationUuid(),
entity.isUrgent()); entity.isUrgent(),
entity.isStory());
} else { } else {
envelope = new SignalServiceEnvelope(entity.getType(), envelope = new SignalServiceEnvelope(entity.getType(),
entity.getTimestamp(), entity.getTimestamp(),
@ -228,7 +229,8 @@ public class SignalServiceMessageReceiver {
messageResult.getServerDeliveredTimestamp(), messageResult.getServerDeliveredTimestamp(),
entity.getServerUuid(), entity.getServerUuid(),
entity.getDestinationUuid(), entity.getDestinationUuid(),
entity.isUrgent()); entity.isUrgent(),
entity.isStory());
} }
callback.onMessage(envelope); callback.onMessage(envelope);

22
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java
Wyświetl plik

@ -64,7 +64,8 @@ public class SignalServiceEnvelope {
long serverDeliveredTimestamp, long serverDeliveredTimestamp,
String uuid, String uuid,
String destinationUuid, String destinationUuid,
boolean urgent) boolean urgent,
boolean story)
{ {
Envelope.Builder builder = Envelope.newBuilder() Envelope.Builder builder = Envelope.newBuilder()
.setType(Envelope.Type.valueOf(type)) .setType(Envelope.Type.valueOf(type))
@ -72,7 +73,8 @@ public class SignalServiceEnvelope {
.setTimestamp(timestamp) .setTimestamp(timestamp)
.setServerTimestamp(serverReceivedTimestamp) .setServerTimestamp(serverReceivedTimestamp)
.setDestinationUuid(destinationUuid) .setDestinationUuid(destinationUuid)
.setUrgent(urgent); .setUrgent(urgent)
.setStory(story);
if (sender.isPresent()) { if (sender.isPresent()) {
builder.setSourceUuid(sender.get().getServiceId().toString()); builder.setSourceUuid(sender.get().getServiceId().toString());
@ -97,14 +99,16 @@ public class SignalServiceEnvelope {
long serverDeliveredTimestamp, long serverDeliveredTimestamp,
String uuid, String uuid,
String destinationUuid, String destinationUuid,
boolean urgent) boolean urgent,
boolean story)
{ {
Envelope.Builder builder = Envelope.newBuilder() Envelope.Builder builder = Envelope.newBuilder()
.setType(Envelope.Type.valueOf(type)) .setType(Envelope.Type.valueOf(type))
.setTimestamp(timestamp) .setTimestamp(timestamp)
.setServerTimestamp(serverReceivedTimestamp) .setServerTimestamp(serverReceivedTimestamp)
.setDestinationUuid(destinationUuid) .setDestinationUuid(destinationUuid)
.setUrgent(urgent); .setUrgent(urgent)
.setStory(story);
if (uuid != null) { if (uuid != null) {
builder.setServerGuid(uuid); builder.setServerGuid(uuid);
@ -245,6 +249,10 @@ public class SignalServiceEnvelope {
return envelope.getUrgent(); return envelope.getUrgent();
} }
public boolean isStory() {
return envelope.getStory();
}
private SignalServiceEnvelopeProto.Builder serializeToProto() { private SignalServiceEnvelopeProto.Builder serializeToProto() {
SignalServiceEnvelopeProto.Builder builder = SignalServiceEnvelopeProto.newBuilder() SignalServiceEnvelopeProto.Builder builder = SignalServiceEnvelopeProto.newBuilder()
.setType(getType()) .setType(getType())
@ -252,7 +260,8 @@ public class SignalServiceEnvelope {
.setTimestamp(getTimestamp()) .setTimestamp(getTimestamp())
.setServerReceivedTimestamp(getServerReceivedTimestamp()) .setServerReceivedTimestamp(getServerReceivedTimestamp())
.setServerDeliveredTimestamp(getServerDeliveredTimestamp()) .setServerDeliveredTimestamp(getServerDeliveredTimestamp())
.setUrgent(isUrgent()); .setUrgent(isUrgent())
.setStory(isStory());
if (getSourceUuid().isPresent()) { if (getSourceUuid().isPresent()) {
builder.setSourceUuid(getSourceUuid().get()); builder.setSourceUuid(getSourceUuid().get());
@ -298,6 +307,7 @@ public class SignalServiceEnvelope {
proto.getServerDeliveredTimestamp(), proto.getServerDeliveredTimestamp(),
proto.getServerGuid(), proto.getServerGuid(),
proto.getDestinationUuid(), proto.getDestinationUuid(),
proto.getUrgent()); proto.getUrgent(),
proto.getStory());
} }
} }

7
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java
Wyświetl plik

@ -40,6 +40,9 @@ public class SignalServiceEnvelopeEntity {
@JsonProperty @JsonProperty
private Boolean urgent; private Boolean urgent;
@JsonProperty
private Boolean story;
public SignalServiceEnvelopeEntity() {} public SignalServiceEnvelopeEntity() {}
public int getType() { public int getType() {
@ -93,4 +96,8 @@ public class SignalServiceEnvelopeEntity {
public boolean isUrgent() { public boolean isUrgent() {
return urgent == null || urgent; return urgent == null || urgent;
} }
public boolean isStory() {
return story != null && story;
}
} }

1
libsignal/service/src/main/proto/InternalSerialization.proto
Wyświetl plik

@ -34,6 +34,7 @@ message SignalServiceEnvelopeProto {
optional string serverGuid = 10; optional string serverGuid = 10;
optional string destinationUuid = 11; optional string destinationUuid = 11;
optional bool urgent = 12 [default = true]; optional bool urgent = 12 [default = true];
optional bool story = 13;
} }
message MetadataProto { message MetadataProto {

3
libsignal/service/src/main/proto/SignalService.proto
Wyświetl plik

@ -35,7 +35,8 @@ message Envelope {
optional uint64 serverTimestamp = 10; optional uint64 serverTimestamp = 10;
optional bool urgent = 14 [default = true]; optional bool urgent = 14 [default = true];
reserved /*updatedPni*/ 15; // Not used presently, may be used in the future reserved /*updatedPni*/ 15; // Not used presently, may be used in the future
// NEXT ID: 16 optional bool story = 16;
// NEXT ID: 17
} }
message Content { message Content {