Bugfixes for v1.29

* If focus was set to document.body during archive, focus left pane
* Shortcut Guide: Add space between text and shortcut highlight
* Ensure that draft attachment can be closed with click on X button
* Move to keyDown event for user idle checking
* Additional resiliency around avatars; check for them on on-disk
* Increase timeouts to preserve websocket connection
* On startup, be resilient to malformed JSON in log files
* Don't crash if shell.openExternal returns an error
* Whenever we request a contact/group sync, also request block list
* Avatar popup: Ensure styling is mouse- and keyboard-appropriate
* MainHeader: Create popperRoot on demand, not on mount
* CompositionInput: Disable default Ctrl-/ shortcut
* Update libphonenumber

libtextsecure/sendmessage.js

@@ -556,6 +556,30 @@ MessageSender.prototype = {
     return this.server.getStickerPackManifest(packId);
   },
 
+  sendRequestBlockSyncMessage(options) {
+    const myNumber = textsecure.storage.user.getNumber();
+    const myDevice = textsecure.storage.user.getDeviceId();
+    if (myDevice !== 1 && myDevice !== '1') {
+      const request = new textsecure.protobuf.SyncMessage.Request();
+      request.type = textsecure.protobuf.SyncMessage.Request.Type.BLOCKED;
+      const syncMessage = this.createSyncMessage();
+      syncMessage.request = request;
+      const contentMessage = new textsecure.protobuf.Content();
+      contentMessage.syncMessage = syncMessage;
+
+      const silent = true;
+      return this.sendIndividualProto(
+        myNumber,
+        contentMessage,
+        Date.now(),
+        silent,
+        options
+      );
+    }
+
+    return Promise.resolve();
+  },
+
   sendRequestConfigurationSyncMessage(options) {
     const myNumber = textsecure.storage.user.getNumber();
     const myDevice = textsecure.storage.user.getDeviceId();
@@ -1236,6 +1260,10 @@ textsecure.MessageSender = function MessageSenderWrapper(username, password) {
   this.sendRequestConfigurationSyncMessage = sender.sendRequestConfigurationSyncMessage.bind(
     sender
   );
+  this.sendRequestBlockSyncMessage = sender.sendRequestBlockSyncMessage.bind(
+    sender
+  );
+
   this.sendMessageToNumber = sender.sendMessageToNumber.bind(sender);
   this.sendMessage = sender.sendMessage.bind(sender);
   this.resetSession = sender.resetSession.bind(sender);

libtextsecure/sync_request.js

@@ -32,6 +32,9 @@
     window.log.info('SyncRequest created. Sending config sync request...');
     wrap(sender.sendRequestConfigurationSyncMessage(sendOptions));
 
+    window.log.info('SyncRequest now sending block sync request...');
+    wrap(sender.sendRequestBlockSyncMessage(sendOptions));
+
     window.log.info('SyncRequest now sending contact sync message...');
     wrap(sender.sendRequestContactSyncMessage(sendOptions))
       .then(() => {

libtextsecure/websocket-resources.js

@@ -191,7 +191,7 @@
         ev.code = code;
         ev.reason = reason;
         this.dispatchEvent(ev);
-      }, 1000);
+      }, 5000);
     };
   };
   window.WebSocketResource.prototype = new textsecure.EventTarget();
@@ -227,7 +227,7 @@
           this.disconnectTimer = setTimeout(() => {
             clearTimeout(this.keepAliveTimer);
             this.wsr.close(3001, 'No response to keepalive request');
-          }, 1000);
+          }, 10000);
         } else {
           this.reset();
         }