devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

onInstalled listener must be wired up in ctor

This commit is contained in:
Kyle Spearrin 2018-01-17 23:21:17 -05:00
parent 4a34f9be59
commit bdc3eb559c
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/background.ts
View File

@ -3,4 +3,6 @@ import MainBackground from './background/main.background';
const bitwardenIsBackground = (window as any).bitwardenIsBackground = true;
const bitwardenMain = (window as any).bitwardenMain = new MainBackground();
bitwardenMain.bootstrap();
bitwardenMain.bootstrap().then(() => {
// Finished bootstrapping
});

46
src/background/runtime.background.ts
View File

@ -20,12 +20,20 @@ export default class RuntimeBackground {
private autofillTimeout: number;
private pageDetailsToAutoFill: any[] = [];
private isSafari: boolean;
private onInstalledReason: string = null;
constructor(private main: MainBackground, private autofillService: AutofillService,
private cipherService: CipherService, private platformUtilsService: PlatformUtilsService,
private storageService: StorageService, private i18nService: any) {
this.isSafari = this.platformUtilsService.isSafari();
this.runtime = this.isSafari ? safari.application : chrome.runtime;
// onInstalled listener must be wired up before anything else, so we do it in the ctor
if (!this.isSafari) {
this.runtime.onInstalled.addListener((details: any) => {
this.onInstalledReason = details.reason;
});
}
}
async init() {
@ -250,43 +258,35 @@ export default class RuntimeBackground {
}
private async checkOnInstalled() {
const gettingStartedUrl = 'https://bitwarden.com/browser-start/';
if (this.isSafari) {
const installedVersionKey = 'installedVersion';
const installedVersion = await this.storageService.get<string>(installedVersionKey);
let reason: string = null;
if (installedVersion == null) {
reason = 'install';
this.onInstalledReason = 'install';
} else if (BrowserApi.getApplicationVersion() !== installedVersion) {
reason = 'update';
this.onInstalledReason = 'update';
}
if (reason != null) {
if (this.onInstalledReason != null) {
await this.storageService.save(installedVersionKey, BrowserApi.getApplicationVersion());
}
}
setTimeout(async () => {
if (this.onInstalledReason != null) {
(window as any).ga('send', {
hitType: 'event',
eventAction: 'onInstalled ' + reason,
});
}
if (reason === 'install') {
BrowserApi.createNewTab(gettingStartedUrl);
await this.setDefaultSettings();
}
} else if (this.runtime.onInstalled) {
this.runtime.onInstalled.addListener(async (details: any) => {
(window as any).ga('send', {
hitType: 'event',
eventAction: 'onInstalled ' + details.reason,
eventAction: 'onInstalled ' + this.onInstalledReason,
});
if (details.reason === 'install') {
BrowserApi.createNewTab(gettingStartedUrl);
if (this.onInstalledReason === 'install') {
BrowserApi.createNewTab('https://bitwarden.com/browser-start/');
await this.setDefaultSettings();
}
});
}
this.onInstalledReason = null;
}
}, 500);
}
private async setDefaultSettings() {