mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Update protos with support for null messages

Browse source 
// FREEBIE
This commit is contained in:
lilia 2017-06-22 10:53:02 -07:00 • committed by Scott Nonnenberg
parent 6e758fc1ea
commit 1e93b12b90
4 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
js/background.js
View file

@ -297,13 +297,13 @@
var state; var state;
switch(ev.verified.state) { switch(ev.verified.state) {
case textsecure.protobuf.SyncMessage.Verified.State.DEFAULT: case textsecure.protobuf.Verified.State.DEFAULT:
state = 'DEFAULT'; state = 'DEFAULT';
break; break;
case textsecure.protobuf.SyncMessage.Verified.State.VERIFIED: case textsecure.protobuf.Verified.State.VERIFIED:
state = 'VERIFIED'; state = 'VERIFIED';
break; break;
case textsecure.protobuf.SyncMessage.Verified.State.UNVERIFIED: case textsecure.protobuf.Verified.State.UNVERIFIED:
state = 'UNVERIFIED'; state = 'UNVERIFIED';
break; break;
} }

2
js/libtextsecure.js
View file

@ -39284,7 +39284,7 @@ MessageSender.prototype = {
var myNumber = textsecure.storage.user.getNumber(); var myNumber = textsecure.storage.user.getNumber();
var myDevice = textsecure.storage.user.getDeviceId(); var myDevice = textsecure.storage.user.getDeviceId();
if (myDevice != 1) { if (myDevice != 1) {
var verified = new textsecure.protobuf.SyncMessage.Verified(); var verified = new textsecure.protobuf.Verified();
verified.state = state; verified.state = state;
verified.destination = destination; verified.destination = destination;
verified.identityKey = identityKey; verified.identityKey = identityKey;

2
libtextsecure/sendmessage.js
View file

@ -322,7 +322,7 @@ MessageSender.prototype = {
var myNumber = textsecure.storage.user.getNumber(); var myNumber = textsecure.storage.user.getNumber();
var myDevice = textsecure.storage.user.getDeviceId(); var myDevice = textsecure.storage.user.getDeviceId();
if (myDevice != 1) { if (myDevice != 1) {
var verified = new textsecure.protobuf.SyncMessage.Verified(); var verified = new textsecure.protobuf.Verified();
verified.state = state; verified.state = state;
verified.destination = destination; verified.destination = destination;
verified.identityKey = identityKey; verified.identityKey = identityKey;

31
protos/IncomingPushMessageSignal.proto
View file

@ -25,6 +25,24 @@ message Content {
optional DataMessage dataMessage = 1; optional DataMessage dataMessage = 1;
optional SyncMessage syncMessage = 2; optional SyncMessage syncMessage = 2;
optional CallMessage callMessage = 3; optional CallMessage callMessage = 3;
optional NullMessage nullMessage = 4;
}
message NullMessage {
optional bytes padding = 1;
}
message Verified {
enum State {
DEFAULT = 0;
VERIFIED = 1;
UNVERIFIED = 2;
}
optional string destination = 1;
optional bytes identityKey = 2;
optional State state = 3;
optional bytes nullMessage = 4;
} }
message CallMessage { message CallMessage {
@ -111,18 +129,6 @@ message SyncMessage {
optional uint64 timestamp = 2; optional uint64 timestamp = 2;
} }
message Verified {
enum State {
DEFAULT = 0;
VERIFIED = 1;
UNVERIFIED = 2;
}
optional string destination = 1;
optional bytes identityKey = 2;
optional State state = 3;
}
optional Sent sent = 1; optional Sent sent = 1;
optional Contacts contacts = 2; optional Contacts contacts = 2;
optional Groups groups = 3; optional Groups groups = 3;
@ -173,6 +179,7 @@ message ContactDetails {
optional string name = 2; optional string name = 2;
optional Avatar avatar = 3; optional Avatar avatar = 3;
optional string color = 4; optional string color = 4;
optional Verified verified = 5;
} }
message GroupDetails { message GroupDetails {