Add protocol support for disappearing messages

signalapp · Sep 29, 2016 · b3e932d · b3e932d
1 parent 11ed42a
commit b3e932d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/js/libtextsecure.js b/js/libtextsecure.js
@@ -38237,7 +38237,7 @@ MessageReceiver.prototype.extend({
             throw e;
         });
     },
-    handleSentMessage: function(destination, timestamp, message) {
+    handleSentMessage: function(destination, timestamp, message, expirationStartTimestamp) {
         var p = Promise.resolve();
         if ((message.flags & textsecure.protobuf.DataMessage.Flags.END_SESSION) ==
                 textsecure.protobuf.DataMessage.Flags.END_SESSION ) {
@@ -38247,9 +38247,10 @@ MessageReceiver.prototype.extend({
             return this.processDecrypted(message, this.number).then(function(message) {
                 var ev = new Event('sent');
                 ev.data = {
-                    destination : destination,
-                    timestamp   : timestamp.toNumber(),
-                    message     : message
+                    destination              : destination,
+                    timestamp                : timestamp.toNumber(),
+                    message                  : message,
+                    expirationStartTimestamp : expirationStartTimestamp
                 };
                 this.dispatchEvent(ev);
             }.bind(this));
@@ -38310,7 +38311,8 @@ MessageReceiver.prototype.extend({
             return this.handleSentMessage(
                     sentMessage.destination,
                     sentMessage.timestamp,
-                    sentMessage.message
+                    sentMessage.message,
+                    sentMessage.expirationStartTimestamp
             );
         } else if (syncMessage.contacts) {
             this.handleContacts(syncMessage.contacts);

diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
@@ -166,7 +166,7 @@ MessageReceiver.prototype.extend({
             throw e;
         });
     },
-    handleSentMessage: function(destination, timestamp, message) {
+    handleSentMessage: function(destination, timestamp, message, expirationStartTimestamp) {
         var p = Promise.resolve();
         if ((message.flags & textsecure.protobuf.DataMessage.Flags.END_SESSION) ==
                 textsecure.protobuf.DataMessage.Flags.END_SESSION ) {
@@ -176,9 +176,10 @@ MessageReceiver.prototype.extend({
             return this.processDecrypted(message, this.number).then(function(message) {
                 var ev = new Event('sent');
                 ev.data = {
-                    destination : destination,
-                    timestamp   : timestamp.toNumber(),
-                    message     : message
+                    destination              : destination,
+                    timestamp                : timestamp.toNumber(),
+                    message                  : message,
+                    expirationStartTimestamp : expirationStartTimestamp
                 };
                 this.dispatchEvent(ev);
             }.bind(this));
@@ -239,7 +240,8 @@ MessageReceiver.prototype.extend({
             return this.handleSentMessage(
                     sentMessage.destination,
                     sentMessage.timestamp,
-                    sentMessage.message
+                    sentMessage.message,
+                    sentMessage.expirationStartTimestamp
             );
         } else if (syncMessage.contacts) {
             this.handleContacts(syncMessage.contacts);

diff --git a/protos/IncomingPushMessageSignal.proto b/protos/IncomingPushMessageSignal.proto
@@ -29,19 +29,22 @@ message Content {
 message DataMessage {
   enum Flags {
     END_SESSION = 1;
+    EXPIRATION_TIMER_UPDATE = 2;
   }
 
   optional string             body        = 1;
   repeated AttachmentPointer  attachments = 2;
   optional GroupContext       group       = 3;
   optional uint32             flags       = 4;
+  optional uint32             expireTimer = 5;
 }
 
 message SyncMessage {
   message Sent {
     optional string  destination = 1;
     optional uint64  timestamp   = 2;
     optional DataMessage message = 3;
+    optional uint64  expirationStartTimestamp = 4;
   }
 
   message Contacts {