Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-12 01:48:21 +02:00
Code Issues Projects Releases Wiki Activity

[Bug] Update lock to be default timeout action (#459)

Browse Source 
* Update jslib 2de8c5e -> 212a2e3

* Updated conditionals to make lock the default state
This commit is contained in:
Vincent Salucci 2020-05-28 15:21:21 -05:00 committed by GitHub
parent dfccb9bc79
commit aa3a6044a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 2858724f4431038be190fc0b748efe287dd1bae6
Subproject commit 212a2e3745e6e0e2b3057ed308c47daf6aeefbc8

12
src/main/powerMonitor.main.ts
View File

@ -23,8 +23,8 @@ export class PowerMonitorMain {
powerMonitor.on('suspend', async () => {
const options = await this.getVaultTimeoutOptions();
if (options[0] === -3) {
options[1] === 'lock' ? this.main.messagingService.send('lockVault') :
this.main.messagingService.send('logout', { expired: false });
options[1] === 'logOut' ? this.main.messagingService.send('logout', { expired: false }) :
this.main.messagingService.send('lockVault');
}
});
}
@ -34,8 +34,8 @@ export class PowerMonitorMain {
powerMonitor.on('lock-screen', async () => {
const options = await this.getVaultTimeoutOptions();
if (options[0] === -2) {
options[1] === 'lock' ? this.main.messagingService.send('lockVault') :
this.main.messagingService.send('logout', { expired: false });
options[1] === 'logOut' ? this.main.messagingService.send('logout', { expired: false }) :
this.main.messagingService.send('lockVault');
}
});
}
@ -51,8 +51,8 @@ export class PowerMonitorMain {
const options = await this.getVaultTimeoutOptions();
if (options[0] === -4) {
options[1] === 'lock' ? this.main.messagingService.send('lockVault') :
this.main.messagingService.send('logout', { expired: false });
options[1] === 'logOut' ? this.main.messagingService.send('logout', { expired: false }) :
this.main.messagingService.send('lockVault');
}
}