Merge pull request #320 from harrynull/fix_proxy

Fix Http Proxy

Author: taooceros

Flow.Launcher.Infrastructure/Http/Http.cs

@@ -16,13 +16,7 @@ public static class Http
     {
         private const string UserAgent = @"Mozilla/5.0 (Trident/7.0; rv:11.0) like Gecko";
 
-        private static HttpClient client;
-
-        private static SocketsHttpHandler socketsHttpHandler = new SocketsHttpHandler()
-        {
-            UseProxy = true,
-            Proxy = WebProxy
-        };
+        private static HttpClient client = new HttpClient();
 
         static Http()
         {
@@ -32,8 +26,8 @@ static Http()
                                                     | SecurityProtocolType.Tls11
                                                     | SecurityProtocolType.Tls12;
 
-            client = new HttpClient(socketsHttpHandler, false);
             client.DefaultRequestHeaders.Add("User-Agent", UserAgent);
+            HttpClient.DefaultProxy = WebProxy;
         }
 
         private static HttpProxy proxy;
@@ -45,6 +39,7 @@ public static HttpProxy Proxy
             {
                 proxy = value;
                 proxy.PropertyChanged += UpdateProxy;
+                UpdateProxy(ProxyProperty.Enabled);
             }
         }
 

Flow.Launcher/App.xaml.cs

@@ -61,6 +61,8 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
                 _settingsVM = new SettingWindowViewModel(_updater, _portable);
                 _settings = _settingsVM.Settings;
 
+                Http.Proxy = _settings.Proxy;
+
                 _alphabet.Initialize(_settings);
                 _stringMatcher = new StringMatcher(_alphabet);
                 StringMatcher.Instance = _stringMatcher;
@@ -85,8 +87,6 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
                 ThemeManager.Instance.Settings = _settings;
                 ThemeManager.Instance.ChangeTheme(_settings.Theme);
 
-                Http.Proxy = _settings.Proxy;
-
                 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
                 RegisterExitEvents();