Sync messages: Additional debugging info, consistent ids

js/background.js

@@ -2815,13 +2815,21 @@
 
   function onReadReceipt(ev) {
     const readAt = ev.timestamp;
-    const { timestamp, source, sourceUuid } = ev.read;
+    const { envelopeTimestamp, timestamp, source, sourceUuid } = ev.read;
     const reader = ConversationController.ensureContactIds({
       e164: source,
       uuid: sourceUuid,
       highTrust: true,
     });
-    window.log.info('read receipt', timestamp, source, sourceUuid, reader);
+    window.log.info(
+      'read receipt',
+      source,
+      sourceUuid,
+      envelopeTimestamp,
+      reader,
+      'for sent message',
+      timestamp
+    );
 
     ev.confirm();
 
@@ -2841,11 +2849,24 @@
 
   function onReadSync(ev) {
     const readAt = ev.timestamp;
-    const { timestamp } = ev.read;
+    const { envelopeTimestamp, sender, senderUuid, timestamp } = ev.read;
-    const { sender, senderUuid } = ev.read;
+    const senderId = ConversationController.ensureContactIds({
-    window.log.info('read sync', sender, senderUuid, timestamp);
+      e164: sender,
+      uuid: senderUuid,
+    });
+
+    window.log.info(
+      'read sync',
+      sender,
+      senderUuid,
+      envelopeTimestamp,
+      senderId,
+      'for message',
+      timestamp
+    );
 
     const receipt = Whisper.ReadSyncs.add({
+      senderId,
       sender,
       senderUuid,
       timestamp,
@@ -2930,13 +2951,13 @@
 
   function onDeliveryReceipt(ev) {
     const { deliveryReceipt } = ev;
-    const { sourceUuid, source } = deliveryReceipt;
+    const {
-
+      envelopeTimestamp,
-    window.log.info(
+      sourceUuid,
-      'delivery receipt from',
+      source,
-      `${source} ${sourceUuid} ${deliveryReceipt.sourceDevice}`,
+      sourceDevice,
-      deliveryReceipt.timestamp
+      timestamp,
-    );
+    } = deliveryReceipt;
 
     ev.confirm();
 
@@ -2946,13 +2967,24 @@
       highTrust: true,
     });
 
+    window.log.info(
+      'delivery receipt from',
+      source,
+      sourceUuid,
+      sourceDevice,
+      deliveredTo,
+      envelopeTimestamp,
+      'for sent message',
+      timestamp
+    );
+
     if (!deliveredTo) {
       window.log.info('no conversation for', source, sourceUuid);
       return;
     }
 
     const receipt = Whisper.DeliveryReceipts.add({
-      timestamp: deliveryReceipt.timestamp,
+      timestamp,
       deliveredTo,
     });
 

js/read_syncs.js

@@ -13,8 +13,12 @@
   window.Whisper = window.Whisper || {};
   Whisper.ReadSyncs = new (Backbone.Collection.extend({
     forMessage(message) {
+      const senderId = window.ConversationController.ensureContactIds({
+        e164: message.get('source'),
+        uuid: message.get('sourceUuid'),
+      });
       const receipt = this.findWhere({
-        sender: message.get('source'),
+        senderId,
         timestamp: message.get('sent_at'),
       });
       if (receipt) {
@@ -34,12 +38,14 @@
           }
         );
 
-        const found = messages.find(
+        const found = messages.find(item => {
-          item =>
+          const senderId = window.ConversationController.ensureContactIds({
-            item.isIncoming() &&
+            e164: item.get('source'),
-            (item.get('source') === receipt.get('sender') ||
+            uuid: item.get('sourceUuid'),
-              item.get('sourceUuid') === receipt.get('senderUuid'))
+          });
-        );
+
+          return item.isIncoming() && senderId === receipt.get('senderId');
+        });
         const notificationForMessage = found
           ? Whisper.Notifications.findWhere({ messageId: found.id })
           : null;
@@ -48,6 +54,7 @@
         if (!found) {
           window.log.info(
             'No message for read sync',
+            receipt.get('senderId'),
             receipt.get('sender'),
             receipt.get('senderUuid'),
             receipt.get('timestamp')

ts/textsecure/MessageReceiver.ts

@@ -1290,6 +1290,7 @@ class MessageReceiverInner extends EventTarget {
         ev.confirm = this.removeFromCache.bind(this, envelope);
         ev.deliveryReceipt = {
           timestamp: receiptMessage.timestamp[i].toNumber(),
+          envelopeTimestamp: envelope.timestamp.toNumber(),
           source: envelope.source,
           sourceUuid: envelope.sourceUuid,
           sourceDevice: envelope.sourceDevice,
@@ -1306,6 +1307,7 @@ class MessageReceiverInner extends EventTarget {
         ev.timestamp = envelope.timestamp.toNumber();
         ev.read = {
           timestamp: receiptMessage.timestamp[i].toNumber(),
+          envelopeTimestamp: envelope.timestamp.toNumber(),
           source: envelope.source,
           sourceUuid: envelope.sourceUuid,
         };
@@ -1569,6 +1571,7 @@ class MessageReceiverInner extends EventTarget {
       ev.confirm = this.removeFromCache.bind(this, envelope);
       ev.timestamp = envelope.timestamp.toNumber();
       ev.read = {
+        envelopeTimestamp: envelope.timestamp.toNumber(),
         timestamp: read[i].timestamp.toNumber(),
         sender: read[i].sender,
         senderUuid: read[i].senderUuid,