diff --git a/js/libtextsecure.js b/js/libtextsecure.js index e35f70693..f2505a5a9 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -39676,6 +39676,8 @@ MessageSender.prototype = { return this.sendIndividualProto(myNumber, contentMessage, Date.now()); } + + return Promise.resolve(); }, sendRequestContactSyncMessage: function() { @@ -39691,6 +39693,8 @@ MessageSender.prototype = { return this.sendIndividualProto(myNumber, contentMessage, Date.now()); } + + return Promise.resolve(); }, syncReadMessages: function(reads) { var myNumber = textsecure.storage.user.getNumber(); @@ -39709,6 +39713,8 @@ MessageSender.prototype = { return this.sendIndividualProto(myNumber, contentMessage, Date.now()); } + + return Promise.resolve(); }, syncVerification: function(destination, state, identityKey) { var myNumber = textsecure.storage.user.getNumber(); @@ -39743,6 +39749,8 @@ MessageSender.prototype = { return this.sendIndividualProto(myNumber, contentMessage, Date.now()); }.bind(this)); } + + return Promise.resolve(); }, sendGroupProto: function(numbers, proto, timestamp) { @@ -40017,8 +40025,15 @@ textsecure.MessageSender.prototype = { this.ongroup = this.onGroupSyncComplete.bind(this); receiver.addEventListener('groupsync', this.ongroup); + console.log('SyncRequest created. Sending contact sync message...'); sender.sendRequestContactSyncMessage().then(function() { - sender.sendRequestGroupSyncMessage(); + console.log('SyncRequest now sending group sync messsage...'); + return sender.sendRequestGroupSyncMessage(); + }).catch(function(error) { + console.log( + 'SyncRequest error:', + error && error.stack ? error.stack : error + ); }); this.timeout = setTimeout(this.onTimeout.bind(this), 60000); } diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js index 9baa12167..d83d0ad0e 100644 --- a/libtextsecure/sendmessage.js +++ b/libtextsecure/sendmessage.js @@ -333,6 +333,8 @@ MessageSender.prototype = { return this.sendIndividualProto(myNumber, contentMessage, Date.now()); } + + return Promise.resolve(); }, sendRequestContactSyncMessage: function() { @@ -348,6 +350,8 @@ MessageSender.prototype = { return this.sendIndividualProto(myNumber, contentMessage, Date.now()); } + + return Promise.resolve(); }, syncReadMessages: function(reads) { var myNumber = textsecure.storage.user.getNumber(); @@ -366,6 +370,8 @@ MessageSender.prototype = { return this.sendIndividualProto(myNumber, contentMessage, Date.now()); } + + return Promise.resolve(); }, syncVerification: function(destination, state, identityKey) { var myNumber = textsecure.storage.user.getNumber(); @@ -400,6 +406,8 @@ MessageSender.prototype = { return this.sendIndividualProto(myNumber, contentMessage, Date.now()); }.bind(this)); } + + return Promise.resolve(); }, sendGroupProto: function(numbers, proto, timestamp) { diff --git a/libtextsecure/sync_request.js b/libtextsecure/sync_request.js index aaa2878a1..e992ec5f3 100644 --- a/libtextsecure/sync_request.js +++ b/libtextsecure/sync_request.js @@ -19,8 +19,15 @@ this.ongroup = this.onGroupSyncComplete.bind(this); receiver.addEventListener('groupsync', this.ongroup); + console.log('SyncRequest created. Sending contact sync message...'); sender.sendRequestContactSyncMessage().then(function() { - sender.sendRequestGroupSyncMessage(); + console.log('SyncRequest now sending group sync messsage...'); + return sender.sendRequestGroupSyncMessage(); + }).catch(function(error) { + console.log( + 'SyncRequest error:', + error && error.stack ? error.stack : error + ); }); this.timeout = setTimeout(this.onTimeout.bind(this), 60000); }