修复无法连接到webdav时重复报同步失败的问题

tangchaoliziyo · Sep 15, 2021 · 327e6b0 · 327e6b0
1 parent 25cee52
commit 327e6b0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/SyncClipboard/Service/SyncService/DownloadService.cs b/SyncClipboard/Service/SyncService/DownloadService.cs
@@ -126,6 +126,10 @@ private async Task PullLoop()
 
         private async Task SetRemoteProfileToLocal(Profile remoteProfile)
         {
+            if (remoteProfile is null)
+            {
+                return;
+            }
             Profile localProfile = ProfileFactory.CreateFromLocal();
             if (localProfile.GetProfileType() == ProfileType.ClipboardType.Unknown)
             {

diff --git a/SyncClipboard/Service/SyncService/Profile/ProfileFactory.cs b/SyncClipboard/Service/SyncService/Profile/ProfileFactory.cs
@@ -99,6 +99,11 @@ private static LocalClipboard GetLocalClipboard()
         public static async Task<Profile> CreateFromRemote(IWebDav webDav)
         {
             string httpReply = await webDav.GetTextAsync(SyncService.REMOTE_RECORD_FILE, 0, 0).ConfigureAwait(false);
+
+            if (string.IsNullOrWhiteSpace(httpReply))
+            {
+                return null;
+            }
             Log.Write("[PULL] json " + httpReply);
 
             JsonProfile jsonProfile;

diff --git a/SyncClipboard/Service/SyncService/UploadService.cs b/SyncClipboard/Service/SyncService/UploadService.cs
@@ -72,7 +72,10 @@ public void PullStoppedHandler()
 
         private void ClipBoardChangedHandler()
         {
-            if (!UserConfig.Config.SyncService.PushSwitchOn || _isChangingLocal)
+            if (string.IsNullOrWhiteSpace(UserConfig.Config.SyncService.RemoteURL) ||
+                string.IsNullOrWhiteSpace(UserConfig.Config.SyncService.UserName) ||
+                string.IsNullOrWhiteSpace(UserConfig.Config.SyncService.Password) ||
+                !UserConfig.Config.SyncService.PushSwitchOn || _isChangingLocal)
             {
                 return;
             }