v1.3.0-beta.1

Update to Electron 1.7.11 (#1996)
 
 Fixed: Crash during input via Chinese IME on Mac (#1996)
 
 Fixed: Expired disappearing messages would sometimes remain in
 conversation (#1983)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iF4EABEIAAYFAlpqO/oACgkQpJMcCWRMZUupvQEAxJqYSaZZIfb+KZM0B6UqXiUT
 KbgZL4+HMKcNHAepgE8BAJ8cGrbcFgXQ0ZQl3KvLwZL1vJlBnMzQep9tyELcPR4K
 =1e19
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iF4EABEIAAYFAlpw8WwACgkQpJMcCWRMZUtNnAD9H7zRkXxo5cce0A2AVNDhZMXX
 V9aQJ8SsAEvMDHBUHRwA/ifRzKM2ywoPVdJzjDsCpsS9GApd2QpQ5oq720kt6LuI
 =5/BP
 -----END PGP SIGNATURE-----

Merge tag 'v1.3.0-beta.1'

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) {

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)

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",

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"