Skip to content

sync: initialize auto-sync after native metered detection #336924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Dmitriy Vasyura (dmitrivMS) wants to merge 1 commit into
base: dev/dmitriv/use-vscode-metered
Choose a base branch
from
+13 −2
Draft

sync: initialize auto-sync after native metered detection #336924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ export class UserDataAutoSyncService extends Disposable implements IUserDataAuto
} else {
this.logService.info('[AutoSync] Disabled.');
}
this.updateAutoSync();
if (this.meteredConnectionService.isConnectionMetered) {
void this.initializeAutoSync();
} else {
this.updateAutoSync();
}

if (this.hasToDisableMachineEventually()) {
this.disableMachineEventually();
Expand All @@ -120,6 +124,13 @@ export class UserDataAutoSyncService extends Disposable implements IUserDataAuto
}
}

private async initializeAutoSync(): Promise<void> {
await this.meteredConnectionService.whenInitialized;
if (!this._store.isDisposed) {
this.updateAutoSync();
}
}

private updateAutoSync(): void {
const { enabled, message } = this.isAutoSyncEnabled();
if (enabled) {
Expand Down
2 changes: 1 addition & 1 deletion src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export class UserDataSyncClient extends Disposable {
await configurationService.initialize();
this.instantiationService.stub(IConfigurationService, configurationService);

this.instantiationService.stub(IMeteredConnectionService, { isConnectionMetered: false, onDidChangeIsConnectionMetered: new Emitter<boolean>().event });
this.instantiationService.stub(IMeteredConnectionService, { isConnectionMetered: false, whenInitialized: Promise.resolve(), onDidChangeIsConnectionMetered: new Emitter<boolean>().event });

this.instantiationService.stub(IRequestService, this.testServer);

Expand Down