use Http.Get from Infrastructure

Author: jjw24

Flow.Launcher.Infrastructure/Http/Http.cs

@@ -66,18 +66,12 @@ public static async Task<string> Get([NotNull] string url, string encoding = "UT
             response = response.NonNull();
             var stream = response.GetResponseStream().NonNull();
 
-            using (var reader = new StreamReader(stream, Encoding.GetEncoding(encoding)))
-            {
-                var content = await reader.ReadToEndAsync();
-                if (response.StatusCode == HttpStatusCode.OK)
-                {
-                    return content;
-                }
-                else
-                {
-                    throw new HttpRequestException($"Error code <{response.StatusCode}> with content <{content}> returned from <{url}>");
-                }
-            }
+            using var reader = new StreamReader(stream, Encoding.GetEncoding(encoding));
+            var content = await reader.ReadToEndAsync();
+            if (response.StatusCode != HttpStatusCode.OK)
+                throw new HttpRequestException($"Error code <{response.StatusCode}> with content <{content}> returned from <{url}>");
+            
+            return content;
         }
     }
 }

Plugins/Flow.Launcher.Plugin.PluginsManager/Models/PluginsManifest.cs

@@ -3,33 +3,38 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Net;
-using System.Text;
+using System.Threading.Tasks;
 
 namespace Flow.Launcher.Plugin.PluginsManager.Models
 {
     internal class PluginsManifest
     {
         internal List<UserPlugin> UserPlugins { get; private set; }
         internal PluginsManifest()
+        {
+            DownloadManifest();
+        }
+
+        private void DownloadManifest()
         {
             var json = string.Empty;
+            try
+            {
+                var t = Task.Run(
+                            async () => 
+                                json = await Http.Get("https://raw.githubusercontent.com/Flow-Launcher/Flow.Launcher.PluginsManifest/main/plugins.json"));
+
+                t.Wait();
 
-            using (var wc = new WebClient { Proxy = Http.WebProxy() })
+                UserPlugins = JsonConvert.DeserializeObject<List<UserPlugin>>(json);
+            }
+            catch (Exception e)
             {
-                try
-                {
-                    json = wc.DownloadString("https://raw.githubusercontent.com/Flow-Launcher/Flow.Launcher.PluginsManifest/main/plugins.json");
-                }
-                catch (Exception e)
-                {
-                    Log.Exception("|PluginManagement.GetManifest|Encountered error trying to download plugins manifest", e);
+                Log.Exception("|PluginManagement.GetManifest|Encountered error trying to download plugins manifest", e);
 
-                    UserPlugins = new List<UserPlugin>();
-                }
+                UserPlugins = new List<UserPlugin>();
             }
 
-            UserPlugins = !string.IsNullOrEmpty(json) ? JsonConvert.DeserializeObject<List<UserPlugin>>(json) : new List<UserPlugin>();
         }
     }
 }