From 92ba295d5224b00c48aea67b8fbc9183fc511ded Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Thu, 3 Aug 2017 18:15:47 -0700
Subject: [PATCH] Better logging for sync sent messages, and new (disappeared)
 msgs

FREEBIE
---
 js/libtextsecure.js               |  6 +++---
 js/models/messages.js             | 10 +++++++++-
 libtextsecure/message_receiver.js |  6 +++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 9717f8956..80f3f5b5f 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -38698,8 +38698,7 @@ MessageReceiver.prototype.extend({
         }
     },
     handleNullMessage: function(envelope, nullMessage) {
-        var encodedNumber = envelope.source + '.' + envelope.sourceDevice;
-        console.log('null message from', encodedNumber, envelope.timestamp.toNumber());
+        console.log('null message from', encodedNumber, this.getEnvelopeId(envelope));
         this.removeFromCache(envelope);
     },
     handleSyncMessage: function(envelope, syncMessage) {
@@ -38714,7 +38713,8 @@ MessageReceiver.prototype.extend({
             console.log('sent message to',
                     sentMessage.destination,
                     sentMessage.timestamp.toNumber(),
-                    'from', envelope.source + '.' + envelope.sourceDevice
+                    'from',
+                    this.getEnvelopeId(envelope)
             );
             return this.handleSentMessage(
                     envelope,
diff --git a/js/models/messages.js b/js/models/messages.js
index 60efa4172..386dc1f98 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -518,7 +518,15 @@
                                     catch (e) {
                                         handleError(e);
                                     }
-                                }, handleError);
+                                }, function(error) {
+                                    console.log('handleDataMessage: Message', message.idForLogging(), 'was deleted');
+
+                                    if (confirm) {
+                                        confirm();
+                                    }
+
+                                    return resolve();
+                                });
                             }, handleError);
                         }, handleError);
                     });
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index d675c8ff9..0267017b6 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -456,8 +456,7 @@ MessageReceiver.prototype.extend({
         }
     },
     handleNullMessage: function(envelope, nullMessage) {
-        var encodedNumber = envelope.source + '.' + envelope.sourceDevice;
-        console.log('null message from', encodedNumber, envelope.timestamp.toNumber());
+        console.log('null message from', encodedNumber, this.getEnvelopeId(envelope));
         this.removeFromCache(envelope);
     },
     handleSyncMessage: function(envelope, syncMessage) {
@@ -472,7 +471,8 @@ MessageReceiver.prototype.extend({
             console.log('sent message to',
                     sentMessage.destination,
                     sentMessage.timestamp.toNumber(),
-                    'from', envelope.source + '.' + envelope.sourceDevice
+                    'from',
+                    this.getEnvelopeId(envelope)
             );
             return this.handleSentMessage(
                     envelope,