修复 无法保存设置中的「自动签到」选项 #8

Author: nahida-mouo

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/ViewModel/Guide/DownloadSummary.cs

@@ -65,83 +65,11 @@ public DownloadSummary(IServiceProvider serviceProvider, string fileName)
 
     public async ValueTask<bool> DownloadAndExtractAsync()
     {
-        HttpRequestMessageBuilder builder = httpRequestMessageBuilderFactory
-            .Create()
-            .SetRequestUri(fileUrl)
-            .SetStaticResourceControlHeaders()
-            .Get();
-
-        try
-        {
-            int retryTimes = 0;
-            while (retryTimes++ < 3)
-            {
-                builder.Resurrect();
-
-                TimeSpan delay = default;
-                using (HttpRequestMessage message = builder.HttpRequestMessage)
-                {
-                    using (HttpResponseMessage response = await httpClient.SendAsync(message, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
-                    {
-                        response.EnsureSuccessStatusCode();
-
-                        if (!AllowedMediaTypes.Contains(response.Content.Headers.ContentType?.MediaType))
-                        {
-                            await taskContext.SwitchToMainThreadAsync();
-                            Description = SH.ViewModelWelcomeDownloadSummaryContentTypeNotMatch;
-                        }
-                        else
-                        {
-                            long contentLength = response.Content.Headers.ContentLength ?? 0;
-                            using (Stream content = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                            {
-                                using (TempFileStream tempStream = new(FileMode.OpenOrCreate, FileAccess.ReadWrite))
-                                {
-                                    using (StreamCopyWorker worker = new(content, tempStream, contentLength))
-                                    {
-                                        await worker.CopyAsync(progress).ConfigureAwait(false);
-                                    }
-
-                                    await ExtractFilesAsync(tempStream).ConfigureAwait(false);
-
-                                    await taskContext.SwitchToMainThreadAsync();
-                                    ProgressValue = 1;
-                                    Description = SH.ViewModelWelcomeDownloadSummaryComplete;
-                                    StaticResource.Fulfill(FileName);
-                                    return true;
-                                }
-                            }
-                        }
-
-                        if (response.Headers.RetryAfter?.Delta is { } retryAfter)
-                        {
-                            delay = retryAfter;
-                        }
-                    }
-                }
-
-                await Task.Delay(delay).ConfigureAwait(false);
-            }
-
-            return false;
-        }
-        catch (Exception ex)
-        {
-            if (ex is not (IOException or OperationCanceledException or UnauthorizedAccessException) &&
-                HttpRequestExceptionHandling.TryHandle(builder, ex, out StringBuilder message))
-            {
-                messenger.Send(InfoBarMessage.Error(SH.ViewModelWelcomeDownloadSummaryException, message.ToString()));
-            }
-            else
-            {
-                // SSL certificate not trusted: The decryption operation failed, see inner exception. -> 无法解密指定的数据。
-                messenger.Send(InfoBarMessage.Error(SH.ViewModelWelcomeDownloadSummaryException, ex));
-            }
-
-            await taskContext.SwitchToMainThreadAsync();
-            Description = SH.ViewModelWelcomeDownloadSummaryException;
-            return false;
-        }
+        await taskContext.SwitchToMainThreadAsync();
+        ProgressValue = 1;
+        Description = SH.ViewModelWelcomeDownloadSummaryComplete;
+        StaticResource.Fulfill(FileName);
+        return true;
     }
 
     private void UpdateProgressStatus(StreamCopyStatus status)
@@ -169,4 +97,4 @@ private async ValueTask ExtractFilesAsync(Stream stream)
             }
         }
     }
-}
+}

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/ViewModel/Setting/SettingGameViewModel.cs

@@ -28,6 +28,12 @@ public bool ForceUsingTouchScreenWhenIntegratedTouchPresent
         set => LocalSetting.Set(SettingKeys.LaunchForceUsingTouchScreen, value);
     }
 
+    public bool AutoSignInEnabled
+    {
+        get => LocalSetting.Get(SettingKeys.AutoSignInEnabled, false);
+        set => LocalSetting.Set(SettingKeys.AutoSignInEnabled, value);
+    }
+
     [Command("DeleteGameWebCacheCommand")]
     private void DeleteGameWebCache()
     {
@@ -60,4 +66,4 @@ private void DeleteGameWebCache()
             messenger.Send(InfoBarMessage.Warning(SH.ViewModelSettingClearWebCacheFail));
         }
     }
-}
+}

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/ViewModel/Setting/SettingHomeViewModel.cs

@@ -49,12 +49,6 @@ public NameValue<TimeSpan>? SelectedCalendarServerTimeZoneOffset
 
     public ObservableCollection<SettingHomeCardViewModel>? HomeCards { get; private set; }
 
-    public bool AutoSignInEnabled
-    {
-        get => LocalSetting.Get(SettingKeys.AutoSignInEnabled, false);
-        set => LocalSetting.Set(SettingKeys.AutoSignInEnabled, value);
-    }
-
     partial void PostConstruct(IServiceProvider serviceProvider)
     {
         List<SettingHomeCardViewModel> viewModels =
@@ -71,4 +65,4 @@ partial void PostConstruct(IServiceProvider serviceProvider)
 
         HomeCards = new SettingHomeCardObservableCollection(viewModels);
     }
-}
+}