From 7d4ae635010b97bd708af72f3381e4ee2d69c9f2 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Thu, 3 Aug 2017 18:12:41 -0700
Subject: [PATCH] MessageReceiver: Log empty event, flow promise properly

FREEBIE
---
 js/libtextsecure.js               | 3 ++-
 libtextsecure/message_receiver.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 80f3f5b5f..f7b948998 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -38370,6 +38370,7 @@ MessageReceiver.prototype.extend({
         this.incoming = [];
 
         var dispatchEmpty = function() {
+            console.log('MessageReceiver: emitting \'empty\' event');
             var ev = new Event('empty');
             return this.dispatchAndWait(ev);
         }.bind(this);
@@ -38681,7 +38682,7 @@ MessageReceiver.prototype.extend({
     },
     handleContentMessage: function (envelope) {
         return this.decrypt(envelope, envelope.content).then(function(plaintext) {
-            this.innerHandleContentMessage(envelope, plaintext);
+            return this.innerHandleContentMessage(envelope, plaintext);
         }.bind(this));
     },
     innerHandleContentMessage: function(envelope, plaintext) {
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 0267017b6..447083415 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -128,6 +128,7 @@ MessageReceiver.prototype.extend({
         this.incoming = [];
 
         var dispatchEmpty = function() {
+            console.log('MessageReceiver: emitting \'empty\' event');
             var ev = new Event('empty');
             return this.dispatchAndWait(ev);
         }.bind(this);
@@ -439,7 +440,7 @@ MessageReceiver.prototype.extend({
     },
     handleContentMessage: function (envelope) {
         return this.decrypt(envelope, envelope.content).then(function(plaintext) {
-            this.innerHandleContentMessage(envelope, plaintext);
+            return this.innerHandleContentMessage(envelope, plaintext);
         }.bind(this));
     },
     innerHandleContentMessage: function(envelope, plaintext) {