From b3eb0646c05b42dad6916eb8f8d2ca48c594cec8 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Wed, 6 Feb 2019 11:15:27 -0800 Subject: [PATCH 1/7] Reenable send when link preview is missing an image --- libtextsecure/sendmessage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js index e42fe21e1..ab070ff55 100644 --- a/libtextsecure/sendmessage.js +++ b/libtextsecure/sendmessage.js @@ -108,7 +108,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; }); } From 0ec0ae9dac575cd71a5930be4cfa41e1b314e022 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Thu, 7 Feb 2019 10:35:49 -0800 Subject: [PATCH 2/7] Protect against unhandled promises when calling checkForUpdates --- app/auto_update.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/auto_update.js b/app/auto_update.js index 26bc105ee..6725cf3cd 100644 --- a/app/auto_update.js +++ b/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) { From 2ce86af0934ae1252b849e29f22c24aaea269041 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Thu, 7 Feb 2019 13:24:39 -0800 Subject: [PATCH 3/7] Ensure that Curve.async points to worker after startWorker call --- libtextsecure/libsignal-protocol.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libtextsecure/libsignal-protocol.js b/libtextsecure/libsignal-protocol.js index b349b11c5..b5eb93b3e 100644 --- a/libtextsecure/libsignal-protocol.js +++ b/libtextsecure/libsignal-protocol.js @@ -25294,13 +25294,20 @@ var origCurve25519 = Internal.curve25519_async; Internal.startWorker = function(url) { Internal.stopWorker(); // there can be only one + Internal.curve25519_async = new Curve25519Worker(url); + Internal.Curve.async = Internal.wrapCurve25519(Internal.curve25519_async); + libsignal.Curve.async = Internal.wrapCurve(Internal.Curve.async); }; Internal.stopWorker = function() { if (Internal.curve25519_async instanceof Curve25519Worker) { var worker = Internal.curve25519_async.worker; + Internal.curve25519_async = origCurve25519; + Internal.Curve.async = Internal.wrapCurve25519(Internal.curve25519_async); + libsignal.Curve.async = Internal.wrapCurve(Internal.Curve.async); + worker.terminate(); } }; @@ -35158,6 +35165,7 @@ Curve25519Worker.prototype = { }; } + Internal.wrapCurve25519 = wrapCurve25519; Internal.Curve = wrapCurve25519(Internal.curve25519); Internal.Curve.async = wrapCurve25519(Internal.curve25519_async); @@ -35185,6 +35193,7 @@ Curve25519Worker.prototype = { }; } + Internal.wrapCurve = wrapCurve; libsignal.Curve = wrapCurve(Internal.Curve); libsignal.Curve.async = wrapCurve(Internal.Curve.async); From 2624a6af88180044280c22e9ea5a5210d1593685 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Thu, 7 Feb 2019 11:39:16 -0800 Subject: [PATCH 4/7] mainWindow.close - be ready for null mainWindow --- main.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main.js b/main.js index 775e160be..a591de670 100644 --- a/main.js +++ b/main.js @@ -369,7 +369,9 @@ function createWindow() { } await requestShutdown(); - mainWindow.readyForShutdown = true; + if (mainWindow) { + mainWindow.readyForShutdown = true; + } app.quit(); }); From 1a7df91dbc30c24cb35210f5e41847bbbad23bf5 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Thu, 7 Feb 2019 17:25:48 -0800 Subject: [PATCH 5/7] Fix: Navigation to message via quote click didn't always work --- js/views/conversation_view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index e841cb914..3d2aafb56 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -708,9 +708,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')) { From 84bb9be6a9c8bcd520301cc0220f4b7109cb0923 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Fri, 8 Feb 2019 12:11:05 -0800 Subject: [PATCH 6/7] v1.21.1-beta.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 865c13399..405ce470c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Signal", "description": "Private messaging from your desktop", "repository": "https://github.com/signalapp/Signal-Desktop.git", - "version": "1.21.0-beta.4", + "version": "1.21.1-beta.1", "license": "GPL-3.0", "author": { "name": "Open Whisper Systems", From 5c8558e293989094693f918a63b672301f1aeb55 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Fri, 8 Feb 2019 12:24:44 -0800 Subject: [PATCH 7/7] v1.21.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 405ce470c..7f4509d9e 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Signal", "description": "Private messaging from your desktop", "repository": "https://github.com/signalapp/Signal-Desktop.git", - "version": "1.21.1-beta.1", + "version": "1.21.1", "license": "GPL-3.0", "author": { "name": "Open Whisper Systems",