|
@@ -63,7 +63,7 @@ class WelcomeController {
|
|
|
|
|
|
// Custom services
|
|
// Custom services
|
|
private webClientService: WebClientService;
|
|
private webClientService: WebClientService;
|
|
- private TrustedKeyStore: TrustedKeyStoreService;
|
|
|
|
|
|
+ private trustedKeyStore: TrustedKeyStoreService;
|
|
private pushService: PushService;
|
|
private pushService: PushService;
|
|
private stateService: StateService;
|
|
private stateService: StateService;
|
|
private config: threema.Config;
|
|
private config: threema.Config;
|
|
@@ -84,7 +84,7 @@ class WelcomeController {
|
|
$timeout: ng.ITimeoutService, $interval: ng.IIntervalService,
|
|
$timeout: ng.ITimeoutService, $interval: ng.IIntervalService,
|
|
$log: ng.ILogService, $window: ng.IWindowService, $mdDialog: ng.material.IDialogService,
|
|
$log: ng.ILogService, $window: ng.IWindowService, $mdDialog: ng.material.IDialogService,
|
|
$translate: ng.translate.ITranslateService,
|
|
$translate: ng.translate.ITranslateService,
|
|
- webClientService: WebClientService, TrustedKeyStore: TrustedKeyStoreService,
|
|
|
|
|
|
+ webClientService: WebClientService, trustedKeyStore: TrustedKeyStoreService,
|
|
stateService: StateService, pushService: PushService,
|
|
stateService: StateService, pushService: PushService,
|
|
browserService: BrowserService,
|
|
browserService: BrowserService,
|
|
versionService: VersionService,
|
|
versionService: VersionService,
|
|
@@ -104,7 +104,7 @@ class WelcomeController {
|
|
|
|
|
|
// Own services
|
|
// Own services
|
|
this.webClientService = webClientService;
|
|
this.webClientService = webClientService;
|
|
- this.TrustedKeyStore = TrustedKeyStore;
|
|
|
|
|
|
+ this.trustedKeyStore = trustedKeyStore;
|
|
this.stateService = stateService;
|
|
this.stateService = stateService;
|
|
this.pushService = pushService;
|
|
this.pushService = pushService;
|
|
this.config = config;
|
|
this.config = config;
|
|
@@ -137,7 +137,7 @@ class WelcomeController {
|
|
}
|
|
}
|
|
|
|
|
|
// Determine whether local storage is available
|
|
// Determine whether local storage is available
|
|
- if (this.TrustedKeyStore.blocked === true) {
|
|
|
|
|
|
+ if (this.trustedKeyStore.blocked === true) {
|
|
$log.error('Cannot access local storage. Is it being blocked by a browser add-on?');
|
|
$log.error('Cannot access local storage. Is it being blocked by a browser add-on?');
|
|
this.showLocalStorageWarning();
|
|
this.showLocalStorageWarning();
|
|
}
|
|
}
|
|
@@ -161,7 +161,7 @@ class WelcomeController {
|
|
// Determine whether trusted key is available
|
|
// Determine whether trusted key is available
|
|
let hasTrustedKey = null;
|
|
let hasTrustedKey = null;
|
|
try {
|
|
try {
|
|
- hasTrustedKey = this.TrustedKeyStore.hasTrustedKey();
|
|
|
|
|
|
+ hasTrustedKey = this.trustedKeyStore.hasTrustedKey();
|
|
} catch (e) {
|
|
} catch (e) {
|
|
$log.error('Exception while accessing local storage:', e);
|
|
$log.error('Exception while accessing local storage:', e);
|
|
this.showLocalStorageException(e);
|
|
this.showLocalStorageException(e);
|
|
@@ -257,7 +257,7 @@ class WelcomeController {
|
|
* Decrypt the keys and initiate the session.
|
|
* Decrypt the keys and initiate the session.
|
|
*/
|
|
*/
|
|
private unlockConfirm(): void {
|
|
private unlockConfirm(): void {
|
|
- const decrypted: threema.TrustedKeyStoreData = this.TrustedKeyStore.retrieveTrustedKey(this.password);
|
|
|
|
|
|
+ const decrypted: threema.TrustedKeyStoreData = this.trustedKeyStore.retrieveTrustedKey(this.password);
|
|
if (decrypted === null) {
|
|
if (decrypted === null) {
|
|
return this.showDecryptionFailed();
|
|
return this.showDecryptionFailed();
|
|
}
|
|
}
|