From 184ce19ad70cae6a902f0846b1e6a9c50d645b5e Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Wed, 16 Jun 2021 19:40:33 -0300 Subject: [PATCH 1/3] fix: autolock polling for desktop --- app/assets/javascripts/services/autolock_service.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/assets/javascripts/services/autolock_service.ts b/app/assets/javascripts/services/autolock_service.ts index 4cfe8f9f1..8c967f48c 100644 --- a/app/assets/javascripts/services/autolock_service.ts +++ b/app/assets/javascripts/services/autolock_service.ts @@ -1,5 +1,4 @@ import { ApplicationService } from '@standardnotes/snjs'; -import { isDesktopApplication } from '@/utils'; const MILLISECONDS_PER_SECOND = 1000; const POLL_INTERVAL = 50; @@ -18,9 +17,7 @@ export class AutolockService extends ApplicationService { private lockAfterDate?: Date onAppLaunch() { - if (!isDesktopApplication()) { - this.beginPolling(); - } + this.beginPolling(); return super.onAppLaunch(); } From 650109f63f388f33cba29dd4e8cedfe24a843fdd Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Thu, 17 Jun 2021 13:18:48 -0300 Subject: [PATCH 2/3] chore(version-snjs): 2.7.2 --- app/assets/javascripts/directives/views/accountMenu.ts | 3 +-- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/directives/views/accountMenu.ts b/app/assets/javascripts/directives/views/accountMenu.ts index 261637063..cf6851e4f 100644 --- a/app/assets/javascripts/directives/views/accountMenu.ts +++ b/app/assets/javascripts/directives/views/accountMenu.ts @@ -228,8 +228,7 @@ class AccountMenuCtrl extends PureViewCtrl { onHostInputChange() { const url = this.getState().formData.url!; - this.application!.setHost(url); - this.application!.setNextVersionHost(url); + this.application!.setCustomHost(url); } refreshEncryptionStatus() { diff --git a/package.json b/package.json index c480173e4..c3be6084b 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@reach/checkbox": "^0.13.2", "@reach/dialog": "^0.13.0", "@standardnotes/sncrypto-web": "1.2.10", - "@standardnotes/snjs": "2.7.1", + "@standardnotes/snjs": "2.7.2", "mobx": "^6.1.6", "mobx-react-lite": "^3.2.0", "preact": "^10.5.12" diff --git a/yarn.lock b/yarn.lock index ab9a5793e..c5a5f6c59 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1936,10 +1936,10 @@ "@standardnotes/sncrypto-common" "^1.2.7" libsodium-wrappers "^0.7.8" -"@standardnotes/snjs@2.7.1": - version "2.7.1" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.1.tgz#e8073942fe9a8f762989ab75df94407b9934ea3e" - integrity sha512-kCZU4Tx6vNYcEeh22ax8Vfr/LYEbgAqI9nSC6jB8MTg6nJzCuh4b/nngW+yVUz91phu156XN0YeMyj7HJ3DWVw== +"@standardnotes/snjs@2.7.2": + version "2.7.2" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.2.tgz#bf44efc6fae67d8f4d76564ae82bced992e8bf74" + integrity sha512-qffg5yvEzdvL3lOkcIUEwzGQl9fk6bgLU7ocK7bLkS213bmNihbWxaGqb0Hk5QvD675snsJdjdKjBDkEOI3ZUA== dependencies: "@standardnotes/auth" "^2.0.0" "@standardnotes/sncrypto-common" "^1.2.9" From 25e46ff2f18feb8d9d77b919e8891e071bfa905e Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Thu, 17 Jun 2021 15:42:46 -0300 Subject: [PATCH 3/3] chore(version-snjs): 2.7.3 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c3be6084b..a8a86e679 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@reach/checkbox": "^0.13.2", "@reach/dialog": "^0.13.0", "@standardnotes/sncrypto-web": "1.2.10", - "@standardnotes/snjs": "2.7.2", + "@standardnotes/snjs": "2.7.3", "mobx": "^6.1.6", "mobx-react-lite": "^3.2.0", "preact": "^10.5.12" diff --git a/yarn.lock b/yarn.lock index c5a5f6c59..95a454fb4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1936,10 +1936,10 @@ "@standardnotes/sncrypto-common" "^1.2.7" libsodium-wrappers "^0.7.8" -"@standardnotes/snjs@2.7.2": - version "2.7.2" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.2.tgz#bf44efc6fae67d8f4d76564ae82bced992e8bf74" - integrity sha512-qffg5yvEzdvL3lOkcIUEwzGQl9fk6bgLU7ocK7bLkS213bmNihbWxaGqb0Hk5QvD675snsJdjdKjBDkEOI3ZUA== +"@standardnotes/snjs@2.7.3": + version "2.7.3" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.3.tgz#3b8d4bbcb0d841e02726193c4540d1b11d772249" + integrity sha512-YzD9/lxUS4nn922gR03/UHL9shqsyqikx+4Ud9v4IqtGEwKpusny4ecKPtvdbot/nedqEKpMZzrqT7xeNiRKqQ== dependencies: "@standardnotes/auth" "^2.0.0" "@standardnotes/sncrypto-common" "^1.2.9"