From e91f2d03770b72e31af3fea755bc96447a51d7cc Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Tue, 27 Jun 2017 09:20:53 -1000
Subject: [PATCH] Miscellaneous wire-up to ensure that failures propagate

FREEBIE
---
 js/models/conversations.js  | 2 +-
 js/signal_protocol_store.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 5fec2d96f3..9a6bceff24 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -122,7 +122,7 @@
         }.bind(this));
     },
     sendVerifySyncMessage: function(number, state) {
-        textsecure.storage.protocol.loadIdentityKey(number).then(function(key) {
+        return textsecure.storage.protocol.loadIdentityKey(number).then(function(key) {
             return textsecure.messaging.syncVerification(number, state, key);
         });
     },
diff --git a/js/signal_protocol_store.js b/js/signal_protocol_store.js
index d49be1c53b..5cfeaf2db7 100644
--- a/js/signal_protocol_store.js
+++ b/js/signal_protocol_store.js
@@ -331,10 +331,10 @@
                     var promises = [];
                     while (sessions.length > 0) {
                         promises.push(new Promise(function(res) {
-                            sessions.pop().destroy().then(res);
+                            sessions.pop().destroy().then(res, res);
                         }));
                     }
-                    Promise.all(promises).then(resolve);
+                    Promise.all(promises).then(resolve, resolve);
                 });
             });
         },
@@ -472,7 +472,7 @@
                             this.archiveSiblingSessions(identifier).then(function() {
                                 resolve(true);
                             }, reject);
-                        }.bind(this));
+                        }.bind(this), reject);
                     } else if (this.isNonBlockingApprovalRequired(identityRecord)) {
                         console.log("Setting approval status...");
                         identityRecord.save({
@@ -547,7 +547,7 @@
                             identityRecord.save({
                             }).then(function() {
                                 resolve();
-                            });
+                            }, reject);
                         } else {
                             reject(identityRecord.validationError);
                         }