From f414c132200fe0d7ca14c398996a25feea0ad35a Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Fri, 23 Jun 2017 15:02:22 -0700 Subject: [PATCH] Protos: Update to optional verified in sync (was: repeated) This means that we no longer need to iterate. FREEBIE --- js/libtextsecure.js | 18 ++++++++---------- libtextsecure/message_receiver.js | 18 ++++++++---------- protos/IncomingPushMessageSignal.proto | 2 +- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/js/libtextsecure.js b/js/libtextsecure.js index 53f2ef44f7..9fee25d287 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -38494,15 +38494,13 @@ MessageReceiver.prototype.extend({ } }, handleVerified: function(verified) { - for (var i = 0; i < verified.length; ++i) { - var ev = new Event('verified'); - ev.verified = { - state: verified[i].state, - destination: verified[i].destination, - identityKey: verified[i].identityKey.toArrayBuffer() - }; - this.dispatchEvent(ev); - } + var ev = new Event('verified'); + ev.verified = { + state: verified.state, + destination: verified.destination, + identityKey: verified.identityKey.toArrayBuffer() + }; + this.dispatchEvent(ev); }, handleRead: function(read, timestamp) { for (var i = 0; i < read.length; ++i) { @@ -38528,7 +38526,7 @@ MessageReceiver.prototype.extend({ eventTarget.dispatchEvent(ev); if (contactDetails.verified) { - this.handleVerified([contactDetails.verified]); + this.handleVerified(contactDetails.verified); } contactDetails = contactBuffer.next(); diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js index dc5ef5a05f..aac0d236f8 100644 --- a/libtextsecure/message_receiver.js +++ b/libtextsecure/message_receiver.js @@ -285,15 +285,13 @@ MessageReceiver.prototype.extend({ } }, handleVerified: function(verified) { - for (var i = 0; i < verified.length; ++i) { - var ev = new Event('verified'); - ev.verified = { - state: verified[i].state, - destination: verified[i].destination, - identityKey: verified[i].identityKey.toArrayBuffer() - }; - this.dispatchEvent(ev); - } + var ev = new Event('verified'); + ev.verified = { + state: verified.state, + destination: verified.destination, + identityKey: verified.identityKey.toArrayBuffer() + }; + this.dispatchEvent(ev); }, handleRead: function(read, timestamp) { for (var i = 0; i < read.length; ++i) { @@ -319,7 +317,7 @@ MessageReceiver.prototype.extend({ eventTarget.dispatchEvent(ev); if (contactDetails.verified) { - this.handleVerified([contactDetails.verified]); + this.handleVerified(contactDetails.verified); } contactDetails = contactBuffer.next(); diff --git a/protos/IncomingPushMessageSignal.proto b/protos/IncomingPushMessageSignal.proto index 09abe982e1..4c8d54d48a 100644 --- a/protos/IncomingPushMessageSignal.proto +++ b/protos/IncomingPushMessageSignal.proto @@ -135,7 +135,7 @@ message SyncMessage { optional Request request = 4; repeated Read read = 5; optional Blocked blocked = 6; - repeated Verified verified = 7; + optional Verified verified = 7; optional bytes padding = 8; }