Merge pull request #188 from sachaaaaa/merge_1_21_1

Merge 1.21.1

app/auto_update.js

@@ -18,8 +18,12 @@ function autoUpdateDisabled() {
   );
 }
 
-function checkForUpdates() {
-  autoUpdater.checkForUpdates();
+async function checkForUpdates() {
+  try {
+    await autoUpdater.checkForUpdates();
+  } catch (error) {
+    console.log('checkForUpdates error:', error.stack);
+  }
 }
 
 let showingDialog = false;
@@ -58,7 +62,7 @@ function showUpdateDialog(mainWindow, messages) {
 }
 
 function onError(error) {
-  console.log('Got an error while updating: ', error.stack);
+  console.log('Got an error while updating:', error.stack);
 }
 
 function initialize(getMainWindow, messages) {

js/views/conversation_view.js

@@ -773,9 +773,9 @@
 
       // Look for message in memory first, which would tell us if we could scroll to it
       const targetMessage = this.model.messageCollection.find(item => {
-        const messageAuthor = item.getContact().id;
+        const messageAuthor = item.getContact();
 
-        if (author !== messageAuthor) {
+        if (!messageAuthor || author !== messageAuthor.id) {
           return false;
         }
         if (id !== item.get('sent_at')) {

libtextsecure/sendmessage.js

@@ -109,7 +109,7 @@ Message.prototype = {
         const item = new textsecure.protobuf.DataMessage.Preview();
         item.title = preview.title;
         item.url = preview.url;
-        item.image = preview.image;
+        item.image = preview.image || null;
         return item;
       });
     }

main.js

@@ -370,7 +370,9 @@ function createWindow() {
     }
 
     await requestShutdown();
-    mainWindow.readyForShutdown = true;
+    if (mainWindow) {
+      mainWindow.readyForShutdown = true;
+    }
     app.quit();
   });
 

package.json

@@ -3,7 +3,7 @@
   "productName": "Loki Messenger",
   "description": "Private messaging from your desktop",
   "repository": "https://github.com/sloki-project/loki-messenger.git",
-  "version": "1.21.0",
+  "version": "1.21.1",
   "license": "GPL-3.0",
   "author": {
     "name": "Open Whisper Systems",