From 92381bc7c9ad5bb9e7c4afcd42e80be2ef7425a7 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 28 Jul 2021 14:41:30 +0200 Subject: [PATCH] do not show settings sync off badge if settings sync is enabled --- resources/web/code-web.js | 3 +++ src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/web/code-web.js b/resources/web/code-web.js index c4bac6317de..aec223238c4 100644 --- a/resources/web/code-web.js +++ b/resources/web/code-web.js @@ -447,6 +447,9 @@ async function handleRoot(req, res) { }, selection, }] + } : undefined, + settingsSyncOptions: args['enable-sync'] ? { + enabled: true } : undefined }; if (args['wrap-iframe']) { diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts index de7ee8b6962..898f3ad9621 100644 --- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts +++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts @@ -177,7 +177,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo private async initializeSyncAfterInitializationContext(): Promise { const requiresInitialization = await this.userDataInitializationService.requiresInitialization(); - if (requiresInitialization) { + if (requiresInitialization && !this.userDataAutoSyncEnablementService.isEnabled()) { this.updateSyncAfterInitializationContext(true); } else { this.updateSyncAfterInitializationContext(this.storageService.getBoolean(CONTEXT_SYNC_AFTER_INITIALIZATION.key, StorageScope.GLOBAL, false)); @@ -461,7 +461,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo badge = new ProgressBadge(() => localize('turning on syncing', "Turning on Settings Sync...")); clazz = 'progress-badge'; priority = 1; - } else if (this.userDataSyncWorkbenchService.accountStatus === AccountStatus.Available && this.syncAfterInitializationContext.get()) { + } else if (this.userDataSyncWorkbenchService.accountStatus === AccountStatus.Available && this.syncAfterInitializationContext.get() && !this.userDataAutoSyncEnablementService.isEnabled()) { badge = new NumberBadge(1, () => localize('settings sync is off', "Settings Sync is Off", SYNC_TITLE)); }