Fix microsoft#89750

sandy081 · sandy081 · commit 2e66ecb80455 · 2020-02-20T23:26:48.000+01:00
diff --git a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
@@ -63,24 +63,19 @@ export class UserDataAutoSyncService extends Disposable implements IUserDataAuto
 				this.resetFailures();
 			} catch (e) {
 				const error = UserDataSyncError.toUserDataSyncError(e);
-				if (error.code === UserDataSyncErrorCode.TurnedOff) {
+				if (error.code === UserDataSyncErrorCode.TurnedOff || error.code === UserDataSyncErrorCode.SessionExpired) {
 					this.logService.info('Auto Sync: Sync is turned off in the cloud.');
 					this.logService.info('Auto Sync: Resetting the local sync state.');
 					await this.userDataSyncService.resetLocal();
 					this.logService.info('Auto Sync: Completed resetting the local sync state.');
 					if (auto) {
-						return this.userDataSyncEnablementService.setEnablement(false);
+						this.userDataSyncEnablementService.setEnablement(false);
+						this._onError.fire(error);
+						return;
 					} else {
 						return this.sync(loop, auto);
 					}
 				}
-				if (error.code === UserDataSyncErrorCode.SessionExpired) {
-					this.logService.info('Auto Sync: Cloud has new session');
-					this.logService.info('Auto Sync: Resetting the local sync state.');
-					await this.userDataSyncService.resetLocal();
-					this.logService.info('Auto Sync: Completed resetting the local sync state.');
-					return this.sync(loop, auto);
-				}
 				this.logService.error(error);
 				this.successiveFailures++;
 				this._onError.fire(error);
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -373,12 +373,22 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 
 	private onAutoSyncError(error: UserDataSyncError): void {
 		switch (error.code) {
+			case UserDataSyncErrorCode.TurnedOff:
+			case UserDataSyncErrorCode.SessionExpired:
+				this.notificationService.notify({
+					severity: Severity.Info,
+					message: localize('turned off', "Turned off sync because it was turned off from other device."),
+					actions: {
+						primary: [new Action('turn on sync', localize('Turn on sync', "Turn on Sync"), undefined, true, () => this.turnOn())]
+					}
+				});
+				return;
 			case UserDataSyncErrorCode.TooLarge:
 				if (error.source === SyncSource.Keybindings || error.source === SyncSource.Settings) {
 					const sourceArea = getSyncAreaLabel(error.source);
 					this.notificationService.notify({
 						severity: Severity.Error,
-						message: localize('too large', "Disabled synchronizing {0} because size of the {1} file to sync is larger than {2}. Please open the file and reduce the size and enable sync", sourceArea, sourceArea, '100kb'),
+						message: localize('too large', "Disabled sync {0} because size of the {1} file to sync is larger than {2}. Please open the file and reduce the size and enable sync", sourceArea, sourceArea, '100kb'),
 						actions: {
 							primary: [new Action('open sync file', localize('open file', "Show {0} file", sourceArea), undefined, true,
 								() => error.source === SyncSource.Settings ? this.preferencesService.openGlobalSettings(true) : this.preferencesService.openGlobalKeybindingSettings(true))]
@@ -390,7 +400,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 				this.disableSync();
 				this.notificationService.notify({
 					severity: Severity.Error,
-					message: localize('error incompatible', "Turned off synchronizing because local data is incompatible with the data in the cloud. Please update {0} and turn on sync to continue syncing.", this.productService.nameLong),
+					message: localize('error incompatible', "Turned off sync because local data is incompatible with the data in the cloud. Please update {0} and turn on sync to continue syncing.", this.productService.nameLong),
 				});
 				return;
 		}
