Revert JSON Null change + fix more warnings

See comment inline re:JSON null

Author: nachmore

Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

@@ -69,7 +69,13 @@ public List<Result> LoadContextMenus(Result selectedResult)
         private static readonly JsonSerializerOptions options = new()
         {
             PropertyNameCaseInsensitive = true,
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+#pragma warning disable SYSLIB0020 
+            // IgnoreNullValues is obsolete, but the replacement JsonIgnoreCondition.WhenWritingNull still 
+            // deserializes null, instead of ignoring it and leaving the default (empty list). We can change the behaviour
+            // to accept null and fallback to a default etc, or just keep IgnoreNullValues for now
+            // see: https://github.com/dotnet/runtime/issues/39152
+            IgnoreNullValues = true,
+#pragma warning restore SYSLIB0020 // Type or member is obsolete
             Converters =
             {
                 new JsonObjectConverter()
@@ -82,12 +88,15 @@ public List<Result> LoadContextMenus(Result selectedResult)
         };
         private Dictionary<string, object> Settings { get; set; }
 
-        private Dictionary<string, FrameworkElement> _settingControls = new();
+        private readonly Dictionary<string, FrameworkElement> _settingControls = new();
 
         private async Task<List<Result>> DeserializedResultAsync(Stream output)
         {
             if (output == Stream.Null) return null;
 
+            var temp = System.Text.Encoding.UTF8.GetString(((MemoryStream)output).ToArray());
+            System.Diagnostics.Debug.WriteLine(temp);
+
             var queryResponseModel =
                 await JsonSerializer.DeserializeAsync<JsonRPCQueryResponseModel>(output, options);
 

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -74,7 +74,7 @@ public static async ValueTask DisposePluginsAsync()
             }
         }
 
-        public static async Task ReloadData()
+        public static async Task ReloadDataAsync()
         {
             await Task.WhenAll(AllPlugins.Select(plugin => plugin.Plugin switch
             {
@@ -327,4 +327,4 @@ public static void ReplaceActionKeyword(string id, string oldActionKeyword, stri
             }
         }
     }
-}
+}

Flow.Launcher.Core/Plugin/PluginsLoader.cs

@@ -45,8 +45,10 @@ public static IEnumerable<PluginPair> DotNetPlugins(List<PluginMetadata> source)
                         var assembly = assemblyLoader.LoadAssemblyAndDependencies();
                         var type = assemblyLoader.FromAssemblyGetTypeOfInterface(assembly,
                             typeof(IAsyncPlugin));
-
+#pragma warning disable IDE0019 // "Use Pattern Matching" - disabled because the pattern is useful for RELEASE
                         var plugin = Activator.CreateInstance(type) as IAsyncPlugin;
+#pragma warning restore IDE0019
+
 #else
                         Assembly assembly = null;
                         IAsyncPlugin plugin = null;

Flow.Launcher.Core/Updater.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
@@ -40,7 +40,7 @@ public async Task UpdateAppAsync(IPublicAPI api, bool silentUpdate = true)
                     api.ShowMsg(api.GetTranslation("pleaseWait"),
                         api.GetTranslation("update_flowlauncher_update_check"));
 
-                using var updateManager = await GitHubUpdateManager(GitHubRepository).ConfigureAwait(false);
+                using var updateManager = await GitHubUpdateManagerAsync(GitHubRepository).ConfigureAwait(false);
 
                 // UpdateApp CheckForUpdate will return value only if the app is squirrel installed
                 var newUpdateInfo = await updateManager.CheckForUpdate().NonNull().ConfigureAwait(false);
@@ -115,7 +115,7 @@ private class GithubRelease
         }
 
         /// https://github.com/Squirrel/Squirrel.Windows/blob/master/src/Squirrel/UpdateManager.Factory.cs
-        private async Task<UpdateManager> GitHubUpdateManager(string repository)
+        private async Task<UpdateManager> GitHubUpdateManagerAsync(string repository)
         {
             var uri = new Uri(repository);
             var api = $"https://api.github.com/repos{uri.AbsolutePath}/releases";
@@ -145,4 +145,4 @@ public string NewVersinoTips(string version)
         }
 
     }
-}
+}

Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs

@@ -78,7 +78,7 @@ private static string CreateExceptionReport(System.Exception ex)
             sb.AppendLine();
             sb.AppendLine("## Assemblies - " + AppDomain.CurrentDomain.FriendlyName);
             sb.AppendLine();
-            foreach (var ass in AppDomain.CurrentDomain.GetAssemblies().OrderBy(o => o.GlobalAssemblyCache ? 50 : 0))
+            foreach (var ass in AppDomain.CurrentDomain.GetAssemblies())
             {
                 sb.Append("* ");
                 sb.Append(ass.FullName);

Flow.Launcher.Infrastructure/Image/ImageHashGenerator.cs

@@ -14,30 +14,23 @@ public class ImageHashGenerator : IImageHashGenerator
     {
         public string GetHashFromImage(ImageSource imageSource)
         {
-            if (!(imageSource is BitmapSource image))
+            if (imageSource is not BitmapSource image)
             {
                 return null;
             }
 
             try
             {
-                using (var outStream = new MemoryStream())
-                {
-                    // PngBitmapEncoder enc2 = new PngBitmapEncoder();
-                    // enc2.Frames.Add(BitmapFrame.Create(tt));
-                    
-                    var enc = new JpegBitmapEncoder();
-                    var bitmapFrame = BitmapFrame.Create(image);
-                    bitmapFrame.Freeze();
-                    enc.Frames.Add(bitmapFrame);
-                    enc.Save(outStream);
-                    var byteArray = outStream.GetBuffer();
-                    using (var sha1 = new SHA1CryptoServiceProvider())
-                    {
-                        var hash = Convert.ToBase64String(sha1.ComputeHash(byteArray));
-                        return hash;
-                    }
-                }
+                using var outStream = new MemoryStream();
+                var enc = new JpegBitmapEncoder();
+                var bitmapFrame = BitmapFrame.Create(image);
+                bitmapFrame.Freeze();
+                enc.Frames.Add(bitmapFrame);
+                enc.Save(outStream);
+                var byteArray = outStream.GetBuffer();
+                using var sha1 = SHA1.Create();
+                var hash = Convert.ToBase64String(sha1.ComputeHash(byteArray));
+                return hash;
             }
             catch
             {
@@ -46,4 +39,4 @@ public string GetHashFromImage(ImageSource imageSource)
 
         }
     }
-}
+}

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -13,11 +13,11 @@ namespace Flow.Launcher.Infrastructure.Image
 {
     public static class ImageLoader
     {
-        private static readonly ImageCache ImageCache = new ImageCache();
+        private static readonly ImageCache ImageCache = new();
         private static BinaryStorage<Dictionary<string, int>> _storage;
-        private static readonly ConcurrentDictionary<string, string> GuidToKey = new ConcurrentDictionary<string, string>();
+        private static readonly ConcurrentDictionary<string, string> GuidToKey = new();
         private static IImageHashGenerator _hashGenerator;
-        private static bool EnableImageHash = true;
+        private static readonly bool EnableImageHash = true;
         public static ImageSource DefaultImage { get; } = new BitmapImage(new Uri(Constant.MissingImgIcon));
 
 
@@ -243,7 +243,6 @@ public static ImageSource Load(string path, bool loadFullImage = false)
                 ImageCache[path] = img;
             }
 
-
             return img;
         }
 

Flow.Launcher.Infrastructure/Storage/BinaryStorage.cs

@@ -9,6 +9,7 @@
 
 namespace Flow.Launcher.Infrastructure.Storage
 {
+#pragma warning disable SYSLIB0011 // BinaryFormatter is obsolete.
     /// <summary>
     /// Stroage object using binary data
     /// Normally, it has better performance, but not readable
@@ -113,4 +114,5 @@ public void Save(T data)
             }
         }
     }
+#pragma warning enable SYSLIB0011
 }

Flow.Launcher.Plugin/AllowedLanguage.cs

@@ -1,5 +1,6 @@
 namespace Flow.Launcher.Plugin
 {
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
     public static class AllowedLanguage
     {
         public static string Python
@@ -35,4 +36,5 @@ public static bool IsAllowed(string language)
                 || language.ToUpper() == Executable.ToUpper();
         }
     }
-}
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
+}

Flow.Launcher.Plugin/BaseModel.cs

@@ -4,14 +4,24 @@
 
 namespace Flow.Launcher.Plugin
 {
+    /// <summary>
+    /// Base model for plugin classes
+    /// </summary>
     public class BaseModel : INotifyPropertyChanged
     {
+        /// <summary>
+        /// Property changed event handler
+        /// </summary>
         public event PropertyChangedEventHandler PropertyChanged;
 
+        /// <summary>
+        /// Invoked when a property changes
+        /// </summary>
+        /// <param name="propertyName"></param>
         [NotifyPropertyChangedInvocator]
         protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));  
         }
     }
-}
+}