From 98f24bb5b89bb0b68259ed5e4818200ac8aff3aa Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 12 Jul 2021 10:48:38 +0200 Subject: [PATCH] remove deprecated api --- .../userDataSync/common/userDataAutoSyncService.ts | 4 ++-- .../browser/userDataAutoSyncEnablementService.ts | 2 +- src/vs/workbench/workbench.web.api.ts | 9 --------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts index 0d258c8e48c..a7494770538 100644 --- a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts +++ b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts @@ -61,14 +61,14 @@ export class UserDataAutoSyncEnablementService extends Disposable implements _IU this._register(storageService.onDidChangeValue(e => this.onDidStorageChange(e))); } - isEnabled(defaultEnablement?: boolean): boolean { + isEnabled(): boolean { switch (this.environmentService.sync) { case 'on': return true; case 'off': return false; } - return this.storageService.getBoolean(enablementKey, StorageScope.GLOBAL, !!defaultEnablement); + return this.storageService.getBoolean(enablementKey, StorageScope.GLOBAL, false); } canToggleEnablement(): boolean { diff --git a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts index 7d4c6ffbb1a..049ad925d59 100644 --- a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts +++ b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts @@ -25,7 +25,7 @@ export class WebUserDataAutoSyncEnablementService extends UserDataAutoSyncEnable this.enabled = this.workbenchEnvironmentService.options?.settingsSyncOptions?.enabled; } if (this.enabled === undefined) { - this.enabled = super.isEnabled(this.workbenchEnvironmentService.options?.enableSyncByDefault); + this.enabled = super.isEnabled(); } return this.enabled; } diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts index 62fad7c518a..3bf89925138 100644 --- a/src/vs/workbench/workbench.web.api.ts +++ b/src/vs/workbench/workbench.web.api.ts @@ -318,15 +318,6 @@ interface IWorkbenchConstructionOptions { */ readonly workspaceProvider?: IWorkspaceProvider; - /** - * Enables Settings Sync by default. - * - * Syncs with the current authenticated user account (provided in [credentialsProvider](#credentialsProvider)) by default. - * - * @deprecated Instead use [settingsSyncOptions](#settingsSyncOptions) to enable/disable settings sync in the workbench. - */ - readonly enableSyncByDefault?: boolean; - /** * Settings sync options */