From e270f5d98db593c8f42d8e505bfe2aa5e1f5a228 Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Wed, 4 Nov 2020 15:29:17 +0100 Subject: [PATCH 1/4] fix: fall back to treating unknown platforms as linux-web Fixes #494 --- app/assets/javascripts/utils.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/utils.ts b/app/assets/javascripts/utils.ts index 5ce4710cb..586d943c9 100644 --- a/app/assets/javascripts/utils.ts +++ b/app/assets/javascripts/utils.ts @@ -4,17 +4,19 @@ export function getPlatformString() { try { const platform = navigator.platform.toLowerCase(); let trimmed = ''; - if (platform.indexOf('mac') !== -1) { + if (platform.includes('mac')) { trimmed = 'mac'; - } else if (platform.indexOf('win') !== -1) { + } else if (platform.includes('win')) { trimmed = 'windows'; - } - if (platform.indexOf('linux') !== -1) { + } else if (platform.includes('linux')) { + trimmed = 'linux'; + } else { + /** Treat other platforms as linux */ trimmed = 'linux'; } return trimmed + (isDesktopApplication() ? '-desktop' : '-web'); } catch (e) { - return 'unknown-platform'; + return 'linux-web'; } } From bb20648bb3baa55df22685d4b3b5ce53e355b69b Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Wed, 4 Nov 2020 15:42:42 +0100 Subject: [PATCH 2/4] chore(deps): upgrade snjs --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f93127ef5..8301edf42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11028,8 +11028,8 @@ "from": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad" }, "snjs": { - "version": "github:standardnotes/snjs#5757198630342821fdb0e8133b1597a39e0502ad", - "from": "github:standardnotes/snjs#5757198630342821fdb0e8133b1597a39e0502ad" + "version": "github:standardnotes/snjs#b07f37232029056699e7eae9af0820ca7cf536d1", + "from": "github:standardnotes/snjs#b07f37232029056699e7eae9af0820ca7cf536d1" }, "sockjs": { "version": "0.3.20", diff --git a/package.json b/package.json index 5dbfe5448..aa8ea1925 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,6 @@ "@bugsnag/js": "^7.5.1", "mobx": "^6.0.1", "sncrypto": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad", - "snjs": "github:standardnotes/snjs#5757198630342821fdb0e8133b1597a39e0502ad" + "snjs": "github:standardnotes/snjs#b07f37232029056699e7eae9af0820ca7cf536d1" } } From 786f668669ae61d67d4eaafc77effcbe008e9ff4 Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Wed, 4 Nov 2020 16:01:48 +0100 Subject: [PATCH 3/4] fix: type error --- app/assets/javascripts/web_device_interface.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/web_device_interface.ts b/app/assets/javascripts/web_device_interface.ts index 8ffc67b73..0df7b5b64 100644 --- a/app/assets/javascripts/web_device_interface.ts +++ b/app/assets/javascripts/web_device_interface.ts @@ -34,7 +34,7 @@ export class WebDeviceInterface extends DeviceInterface { } async getRawStorageValue(key: string) { - return localStorage.getItem(key); + return localStorage.getItem(key) as any; } async getAllRawStorageKeyValues() { From 1fff47987b3b8a0e9f2a4d3100951585192ac5cc Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Wed, 4 Nov 2020 16:13:27 +0100 Subject: [PATCH 4/4] chore(version): 3.5.4 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8301edf42..c794e3773 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "standard-notes-web", - "version": "3.5.3", + "version": "3.5.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index aa8ea1925..f459d3b2c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "standard-notes-web", - "version": "3.5.3", + "version": "3.5.4", "license": "AGPL-3.0-or-later", "repository": { "type": "git",