From af8274247b2242fe93ad2f7ca4c13f9f7ecf2860 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 2 Jul 2019 08:26:33 -0400 Subject: [PATCH] re-set favicon state on unlock/login --- jslib | 2 +- src/popup/accounts/lock.component.ts | 5 +++-- src/popup/accounts/login.component.ts | 6 ++++-- src/popup/accounts/two-factor.component.ts | 8 ++++++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/jslib b/jslib index 3238b819268..2aa71f98a1f 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 3238b819268d2155376a22b963887f59a3eeb7ca +Subproject commit 2aa71f98a1f623470b3bd71306e0ef8a1ba97758 diff --git a/src/popup/accounts/lock.component.ts b/src/popup/accounts/lock.component.ts index 8344000c16b..708ee746bc9 100644 --- a/src/popup/accounts/lock.component.ts +++ b/src/popup/accounts/lock.component.ts @@ -7,6 +7,7 @@ import { I18nService } from 'jslib/abstractions/i18n.service'; import { LockService } from 'jslib/abstractions/lock.service'; import { MessagingService } from 'jslib/abstractions/messaging.service'; import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { StateService } from 'jslib/abstractions/state.service'; import { StorageService } from 'jslib/abstractions/storage.service'; import { UserService } from 'jslib/abstractions/user.service'; @@ -21,9 +22,9 @@ export class LockComponent extends BaseLockComponent { platformUtilsService: PlatformUtilsService, messagingService: MessagingService, userService: UserService, cryptoService: CryptoService, storageService: StorageService, lockService: LockService, - environmentService: EnvironmentService) { + environmentService: EnvironmentService, stateService: StateService) { super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService, - storageService, lockService, environmentService); + storageService, lockService, environmentService, stateService); this.successRoute = '/tabs/current'; } diff --git a/src/popup/accounts/login.component.ts b/src/popup/accounts/login.component.ts index dbe0a63aaf5..e0f6cd93c8d 100644 --- a/src/popup/accounts/login.component.ts +++ b/src/popup/accounts/login.component.ts @@ -4,6 +4,7 @@ import { Router } from '@angular/router'; import { AuthService } from 'jslib/abstractions/auth.service'; import { I18nService } from 'jslib/abstractions/i18n.service'; import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { StateService } from 'jslib/abstractions/state.service'; import { StorageService } from 'jslib/abstractions/storage.service'; import { SyncService } from 'jslib/abstractions/sync.service'; @@ -16,8 +17,9 @@ import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/l export class LoginComponent extends BaseLoginComponent { constructor(authService: AuthService, router: Router, platformUtilsService: PlatformUtilsService, i18nService: I18nService, - syncService: SyncService, storageService: StorageService) { - super(authService, router, platformUtilsService, i18nService, storageService); + syncService: SyncService, storageService: StorageService, + stateService: StateService) { + super(authService, router, platformUtilsService, i18nService, storageService, stateService); super.onSuccessfulLogin = () => { return syncService.fullSync(true); }; diff --git a/src/popup/accounts/two-factor.component.ts b/src/popup/accounts/two-factor.component.ts index 87f351609c0..8abab799466 100644 --- a/src/popup/accounts/two-factor.component.ts +++ b/src/popup/accounts/two-factor.component.ts @@ -15,6 +15,8 @@ import { AuthService } from 'jslib/abstractions/auth.service'; import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { I18nService } from 'jslib/abstractions/i18n.service'; import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { StateService } from 'jslib/abstractions/state.service'; +import { StorageService } from 'jslib/abstractions/storage.service'; import { SyncService } from 'jslib/abstractions/sync.service'; import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; @@ -37,8 +39,10 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { platformUtilsService: PlatformUtilsService, syncService: SyncService, environmentService: EnvironmentService, private ngZone: NgZone, private broadcasterService: BroadcasterService, private changeDetectorRef: ChangeDetectorRef, - private popupUtilsService: PopupUtilsService) { - super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService); + private popupUtilsService: PopupUtilsService, stateService: StateService, + storageService: StorageService) { + super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService, + stateService, storageService); super.onSuccessfulLogin = () => { return syncService.fullSync(true); };