redirect to lock screen on locked event

This commit is contained in:
Kyle Spearrin 2019-03-19 15:45:39 -04:00
parent eb07b1b080
commit 7a161fa028
4 changed files with 5 additions and 3 deletions

2
jslib

@ -1 +1 @@
Subproject commit d8f9177c03549667cf6d1e5f30536d010acc7b7d Subproject commit fc1a73c9f2ef2c18f05dfebb5cf80ce84520d118

View File

@ -151,7 +151,7 @@ export default class MainBackground {
this.searchService = new SearchService(this.cipherService, this.platformUtilsService); this.searchService = new SearchService(this.cipherService, this.platformUtilsService);
this.lockService = new LockService(this.cipherService, this.folderService, this.collectionService, this.lockService = new LockService(this.cipherService, this.folderService, this.collectionService,
this.cryptoService, this.platformUtilsService, this.storageService, this.messagingService, this.cryptoService, this.platformUtilsService, this.storageService, this.messagingService,
this.searchService, async () => { this.searchService, this.userService, async () => {
if (this.notificationsService != null) { if (this.notificationsService != null) {
this.notificationsService.updateConnection(false); this.notificationsService.updateConnection(false);
} }

View File

@ -101,6 +101,9 @@ export class AppComponent implements OnInit {
}); });
} else if (msg.command === 'locked') { } else if (msg.command === 'locked') {
this.stateService.purge(); this.stateService.purge();
this.ngZone.run(() => {
this.router.navigate(['lock']);
});
} else if (msg.command === 'showDialog') { } else if (msg.command === 'showDialog') {
await this.showDialog(msg); await this.showDialog(msg);
} else if (msg.command === 'showToast') { } else if (msg.command === 'showToast') {

View File

@ -167,7 +167,6 @@ export class SettingsComponent implements OnInit {
async lock() { async lock() {
this.analytics.eventTrack.next({ action: 'Lock Now' }); this.analytics.eventTrack.next({ action: 'Lock Now' });
await this.lockService.lock(true); await this.lockService.lock(true);
this.router.navigate(['lock']);
} }
async logOut() { async logOut() {