From 14b3c5677cefd675b8dbd353025da6423a287630 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Wed, 24 Oct 2018 15:47:43 -0700 Subject: [PATCH 1/7] v1.17.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9c1d57a95..85bea262d 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.17.1-beta.1", + "version": "1.17.1", "license": "GPL-3.0", "author": { "name": "Open Whisper Systems", From 7e16b1eb726b568690aad86e5470a6a5722dd0f1 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Mon, 29 Oct 2018 14:44:26 -0700 Subject: [PATCH 2/7] v1.17.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c14a8a7b6..cbd503b07 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.17.2-beta.1", + "version": "1.17.2", "license": "GPL-3.0", "author": { "name": "Open Whisper Systems", From 712193a20fb5a43b9491480566546dd329a4f055 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Wed, 31 Oct 2018 09:44:18 -0700 Subject: [PATCH 3/7] Import: Be resilient to deletions from importObject --- js/modules/backup.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/js/modules/backup.js b/js/modules/backup.js index b33f87490..e5d0a4be2 100644 --- a/js/modules/backup.js +++ b/js/modules/backup.js @@ -344,6 +344,8 @@ async function importFromJsonString(db, jsonString, targetPath, options) { transaction.oncomplete = finish.bind(null, 'transaction complete'); _.each(remainingStoreNames, storeName => { + const items = importObject[storeName]; + window.log.info('Importing items for store', storeName); let count = 0; @@ -367,11 +369,12 @@ async function importFromJsonString(db, jsonString, targetPath, options) { } }; - if (!importObject[storeName].length) { + if (!items || !items.length) { finishStore(); + return; } - _.each(importObject[storeName], toAdd => { + _.each(items, toAdd => { toAdd = unstringify(toAdd); const haveGroupAlready = @@ -386,7 +389,7 @@ async function importFromJsonString(db, jsonString, targetPath, options) { const request = transaction.objectStore(storeName).put(toAdd, toAdd.id); request.onsuccess = () => { count += 1; - if (count === importObject[storeName].length) { + if (count + skipCount >= items.length) { finishStore(); } }; From 952dcc3fb510848ec0549523b4e113d31005e397 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Wed, 31 Oct 2018 11:08:45 -0700 Subject: [PATCH 4/7] v1.17.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cbd503b07..22e79e401 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.17.2", + "version": "1.17.3", "license": "GPL-3.0", "author": { "name": "Open Whisper Systems", From cb50451011be40c879e316eae96b72ef51333453 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Tue, 13 Nov 2018 09:44:30 -0800 Subject: [PATCH 5/7] Bump sender certificate timer after registration for re-link --- js/modules/refresh_sender_certificate.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/js/modules/refresh_sender_certificate.js b/js/modules/refresh_sender_certificate.js index a25f10d3e..83acef60d 100644 --- a/js/modules/refresh_sender_certificate.js +++ b/js/modules/refresh_sender_certificate.js @@ -7,9 +7,9 @@ module.exports = { const ONE_DAY = 24 * 60 * 60 * 1000; // one day const MINIMUM_TIME_LEFT = 2 * 60 * 60 * 1000; // two hours -let initialized = false; let timeout = null; let scheduledTime = null; +let scheduleNext = null; // We need to refresh our own profile regularly to account for newly-added devices which // do not support unidentified delivery. @@ -20,11 +20,12 @@ function refreshOurProfile() { } function initialize({ events, storage, navigator, logger }) { - if (initialized) { - logger.warn('refreshSenderCertificate: already initialized!'); + // We don't want to set up all of the below functions, but we do want to ensure that our + // refresh timer is up-to-date. + if (scheduleNext) { + scheduleNext(); return; } - initialized = true; runWhenOnline(); @@ -55,6 +56,9 @@ function initialize({ events, storage, navigator, logger }) { setTimeoutForNextRun(time); } + // Keeping this entrypoint around so more inialize() calls just kick the timing + scheduleNext = scheduleNextRotation; + async function run() { logger.info('refreshSenderCertificate: Getting new certificate...'); try { From ca4e2177b4b688a92ba55e90ab5a6b7b8a454903 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Wed, 14 Nov 2018 15:22:38 -0800 Subject: [PATCH 6/7] Fix reference to nonexistent variable --- js/modules/refresh_sender_certificate.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/js/modules/refresh_sender_certificate.js b/js/modules/refresh_sender_certificate.js index 83acef60d..275453fda 100644 --- a/js/modules/refresh_sender_certificate.js +++ b/js/modules/refresh_sender_certificate.js @@ -29,11 +29,7 @@ function initialize({ events, storage, navigator, logger }) { runWhenOnline(); - events.on('timetravel', () => { - if (initialized) { - scheduleNextRotation(); - } - }); + events.on('timetravel', scheduleNextRotation); function scheduleNextRotation() { const now = Date.now(); From 20632b95815ecb3a7594c0d09069bf32c39dacc2 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Wed, 14 Nov 2018 15:43:27 -0800 Subject: [PATCH 7/7] v1.18.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 59cf4ed48..29636466a 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.18.0-beta.7", + "version": "1.18.0", "license": "GPL-3.0", "author": { "name": "Open Whisper Systems",