diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index f36be0302..d19ceb636 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -645,8 +645,24 @@ } }, onExpiredCollection: function(message) { - console.log('removing message', message.get('sent_at'), 'from collection'); - this.model.messageCollection.remove(message.id); + var removeMessage = function() { + console.log( + 'removing message', + message.get('sent_at'), + 'from collection' + ); + this.model.messageCollection.remove(message.id); + }.bind(this); + + // If a fetch is in progress, then we need to wait until that's complete to + // do this removal. Otherwise we could remove from messageCollection, then + // the async database fetch could include the removed message. + + if (this.inProgressFetch) { + this.inProgressFetch.then(removeMessage); + } else { + removeMessage(); + } }, addMessage: function(message) { diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js index 11434168a..befba50d2 100644 --- a/libtextsecure/message_receiver.js +++ b/libtextsecure/message_receiver.js @@ -595,8 +595,12 @@ MessageReceiver.prototype.extend({ } if (syncMessage.sent) { var sentMessage = syncMessage.sent; + var to = sentMessage.message.group + ? 'group(' + sentMessage.message.group.id.toBinary() + ')' + : sentMessage.destination; + console.log('sent message to', - sentMessage.destination, + to, sentMessage.timestamp.toNumber(), 'from', this.getEnvelopeId(envelope) diff --git a/package.json b/package.json index e8ade8e93..d2294b80b 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Signal", "description": "Private messaging from your desktop", "repository": "https://github.com/WhisperSystems/Signal-Desktop.git", - "version": "1.2.0", + "version": "1.3.0-beta.1", "license": "GPL-3.0", "author": { "name": "Open Whisper Systems", @@ -68,7 +68,7 @@ "asar": "^0.14.0", "bower": "^1.8.2", "chai": "^4.1.2", - "electron": "1.7.10", + "electron": "1.7.11", "electron-builder": "^19.53.7", "electron-icon-maker": "0.0.3", "electron-publisher-s3": "^19.53.7", diff --git a/yarn.lock b/yarn.lock index e8fe4a803..b618af367 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1516,9 +1516,9 @@ electron-updater@^2.19.0: semver "^5.4.1" source-map-support "^0.5.0" -electron@1.7.10: - version "1.7.10" - resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.10.tgz#3a3e83d965fd7fafe473be8ddf8f472561b6253d" +electron@1.7.11: + version "1.7.11" + resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.11.tgz#993b6aa79e0e79a7cfcc369f4c813fbd9a0b08d9" dependencies: "@types/node" "^7.0.18" electron-download "^3.0.1"