From b33c5c4c07eb960c9badcb7876a3ea3344d2bf57 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Tue, 8 Aug 2017 10:05:22 -0700
Subject: [PATCH] MessageReceiver: Wait for all code paths in handleSyncMessage

Without this, the recent changes to wait for read receipts and delivery
receipts don't have much of an effect.

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

diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index bf6f3443b..3d4efd01c 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -38745,20 +38745,20 @@ MessageReceiver.prototype.extend({
                     sentMessage.expirationStartTimestamp
             );
         } else if (syncMessage.contacts) {
-            this.handleContacts(envelope, syncMessage.contacts);
+            return this.handleContacts(envelope, syncMessage.contacts);
         } else if (syncMessage.groups) {
-            this.handleGroups(envelope, syncMessage.groups);
+            return this.handleGroups(envelope, syncMessage.groups);
         } else if (syncMessage.blocked) {
-            this.handleBlocked(envelope, syncMessage.blocked);
+            return this.handleBlocked(envelope, syncMessage.blocked);
         } else if (syncMessage.request) {
             console.log('Got SyncMessage Request');
-            this.removeFromCache(envelope);
+            return this.removeFromCache(envelope);
         } else if (syncMessage.read && syncMessage.read.length) {
             console.log('read messages',
                     'from', envelope.source + '.' + envelope.sourceDevice);
-            this.handleRead(envelope, syncMessage.read);
+            return this.handleRead(envelope, syncMessage.read);
         } else if (syncMessage.verified) {
-            this.handleVerified(envelope, syncMessage.verified);
+            return this.handleVerified(envelope, syncMessage.verified);
         } else {
             throw new Error('Got empty SyncMessage');
         }
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 9afb5e034..2771c02a5 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -496,20 +496,20 @@ MessageReceiver.prototype.extend({
                     sentMessage.expirationStartTimestamp
             );
         } else if (syncMessage.contacts) {
-            this.handleContacts(envelope, syncMessage.contacts);
+            return this.handleContacts(envelope, syncMessage.contacts);
         } else if (syncMessage.groups) {
-            this.handleGroups(envelope, syncMessage.groups);
+            return this.handleGroups(envelope, syncMessage.groups);
         } else if (syncMessage.blocked) {
-            this.handleBlocked(envelope, syncMessage.blocked);
+            return this.handleBlocked(envelope, syncMessage.blocked);
         } else if (syncMessage.request) {
             console.log('Got SyncMessage Request');
-            this.removeFromCache(envelope);
+            return this.removeFromCache(envelope);
         } else if (syncMessage.read && syncMessage.read.length) {
             console.log('read messages',
                     'from', envelope.source + '.' + envelope.sourceDevice);
-            this.handleRead(envelope, syncMessage.read);
+            return this.handleRead(envelope, syncMessage.read);
         } else if (syncMessage.verified) {
-            this.handleVerified(envelope, syncMessage.verified);
+            return this.handleVerified(envelope, syncMessage.verified);
         } else {
             throw new Error('Got empty SyncMessage');
         }