development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 13:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #153239 from microsoft/joao/crowded-wildebeest

Browse source 
refactor: 🩺 use StorageScope.Application for update feature
This commit is contained in:
Sandeep Somavarapu 2022-06-26 22:06:38 +02:00 committed by GitHub
parent 4d427d6aa9 4959d43066
commit ebaa253b6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/vs/workbench/contrib/update/browser/update.ts
View file

@ -163,7 +163,7 @@ export class ProductContribution implements IWorkbenchContribution {
return;
}
const lastVersion = parseVersion(storageService.get(ProductContribution.KEY, StorageScope.PROFILE, ''));
const lastVersion = parseVersion(storageService.get(ProductContribution.KEY, StorageScope.APPLICATION, ''));
const currentVersion = parseVersion(productService.version);
const shouldShowReleaseNotes = configurationService.getValue<boolean>('update.showReleaseNotes');
const releaseNotesUrl = productService.releaseNotesUrl;
@ -186,7 +186,7 @@ export class ProductContribution implements IWorkbenchContribution {
});
}
storageService.store(ProductContribution.KEY, productService.version, StorageScope.PROFILE, StorageTarget.MACHINE);
storageService.store(ProductContribution.KEY, productService.version, StorageScope.APPLICATION, StorageTarget.MACHINE);
});
}
}
@ -224,12 +224,12 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
*/
const currentVersion = this.productService.commit;
const lastKnownVersion = this.storageService.get('update/lastKnownVersion', StorageScope.PROFILE);
const lastKnownVersion = this.storageService.get('update/lastKnownVersion', StorageScope.APPLICATION);
// if current version != stored version, clear both fields
if (currentVersion !== lastKnownVersion) {
this.storageService.remove('update/lastKnownVersion', StorageScope.PROFILE);
this.storageService.remove('update/updateNotificationTime', StorageScope.PROFILE);
this.storageService.remove('update/lastKnownVersion', StorageScope.APPLICATION);
this.storageService.remove('update/updateNotificationTime', StorageScope.APPLICATION);
}
this.registerGlobalActivityActions();
@ -400,15 +400,15 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
private shouldShowNotification(): boolean {
const currentVersion = this.productService.commit;
const currentMillis = new Date().getTime();
const lastKnownVersion = this.storageService.get('update/lastKnownVersion', StorageScope.PROFILE);
const lastKnownVersion = this.storageService.get('update/lastKnownVersion', StorageScope.APPLICATION);
// if version != stored version, save version and date
if (currentVersion !== lastKnownVersion) {
this.storageService.store('update/lastKnownVersion', currentVersion!, StorageScope.PROFILE, StorageTarget.MACHINE);
this.storageService.store('update/updateNotificationTime', currentMillis, StorageScope.PROFILE, StorageTarget.MACHINE);
this.storageService.store('update/lastKnownVersion', currentVersion!, StorageScope.APPLICATION, StorageTarget.MACHINE);
this.storageService.store('update/updateNotificationTime', currentMillis, StorageScope.APPLICATION, StorageTarget.MACHINE);
}
const updateNotificationMillis = this.storageService.getNumber('update/updateNotificationTime', StorageScope.PROFILE, currentMillis);
const updateNotificationMillis = this.storageService.getNumber('update/updateNotificationTime', StorageScope.APPLICATION, currentMillis);
const diffDays = (currentMillis - updateNotificationMillis) / (1000 * 60 * 60 * 24);
return diffDays > 5;
@ -536,12 +536,12 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
const userDataSyncStore = userDataSyncStoreManagementService.userDataSyncStore;
let userDataSyncStoreType: UserDataSyncStoreType | undefined;
if (userDataSyncStore && isSwitchingToInsiders && userDataSyncEnablementService.isEnabled()
&& !storageService.getBoolean(selectSettingsSyncServiceDialogShownKey, StorageScope.PROFILE, false)) {
&& !storageService.getBoolean(selectSettingsSyncServiceDialogShownKey, StorageScope.APPLICATION, false)) {
userDataSyncStoreType = await this.selectSettingsSyncService(dialogService);
if (!userDataSyncStoreType) {
return;
}
storageService.store(selectSettingsSyncServiceDialogShownKey, true, StorageScope.PROFILE, StorageTarget.USER);
storageService.store(selectSettingsSyncServiceDialogShownKey, true, StorageScope.APPLICATION, StorageTarget.USER);
if (userDataSyncStoreType === 'stable') {
// Update the stable service type in the current window, so that it uses stable service after switched to insiders version (after reload).
await userDataSyncStoreManagementService.switch(userDataSyncStoreType);
@ -576,7 +576,7 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
} else {
// Reset
if (userDataSyncStoreType) {
storageService.remove(selectSettingsSyncServiceDialogShownKey, StorageScope.PROFILE);
storageService.remove(selectSettingsSyncServiceDialogShownKey, StorageScope.APPLICATION);
}
}
} catch (error) {