Appcenter fixes for 2.3.5 (#9667)

Author: gave92

src/Files.Shared/Extensions/LinqExtensions.cs

@@ -42,16 +42,16 @@ public static class LinqExtensions
             return defaultValue;
         }
 
-        public static async Task<TValue?> GetAsync<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, Func<Task<TValue?>> defaultValueFunc)
+        public static Task<TValue?> GetAsync<TKey, TValue>(this IDictionary<TKey, Task<TValue?>> dictionary, TKey key, Func<Task<TValue?>> defaultValueFunc)
         {
             if (dictionary is null || key is null)
             {
-                return await defaultValueFunc();
+                return defaultValueFunc();
             }
             if (!dictionary.ContainsKey(key))
             {
-                var defaultValue = await defaultValueFunc();
-                if (defaultValue is TValue value)
+                var defaultValue = defaultValueFunc();
+                if (defaultValue is Task<TValue?> value)
                 {
                     dictionary.Add(key, value);
                 }

src/Files.Uwp/Filesystem/StorageItems/ZipStorageFile.cs

@@ -468,7 +468,8 @@ private IAsyncOperation<SevenZipExtractor> OpenZipFileAsync(bool openProtected =
         {
             return AsyncInfo.Run<SevenZipExtractor>(async (cancellationToken) =>
             {
-                return new SevenZipExtractor(await OpenZipFileAsync(FileAccessMode.Read, openProtected));
+                var zipFile = await OpenZipFileAsync(FileAccessMode.Read, openProtected);
+                return zipFile is not null ? new SevenZipExtractor(zipFile) : null;
             });
         }
 

src/Files.Uwp/Filesystem/StorageItems/ZipStorageFolder.cs

@@ -76,7 +76,7 @@ public static bool IsZipPath(string path, bool includeRoot = true)
             return (marker == path.Length && includeRoot) || (marker < path.Length && path[marker] is '\\');
         }
 
-        private static Dictionary<string, bool> defaultAppDict = new Dictionary<string, bool>();
+        private static Dictionary<string, Task<bool>> defaultAppDict = new Dictionary<string, Task<bool>>();
         public static async Task<bool> CheckDefaultZipApp(string filePath)
         {
             Func<Task<bool>> queryFileAssoc = async () =>
@@ -487,7 +487,8 @@ private IAsyncOperation<SevenZipExtractor> OpenZipFileAsync()
         {
             return AsyncInfo.Run<SevenZipExtractor>(async (cancellationToken) =>
             {
-                return new SevenZipExtractor(await OpenZipFileAsync(FileAccessMode.Read));
+                var zipFile = await OpenZipFileAsync(FileAccessMode.Read);
+                return zipFile is not null ? new SevenZipExtractor(zipFile) : null;
             });
         }
 

src/Files.Uwp/UserControls/Menus/FileTagsContextMenu.xaml.cs

@@ -57,7 +57,8 @@ private static void RemoveFileTag(List<ListedItem> selectedListedItems, FileTagV
                 var existingTags = selectedItem.FileTags ?? Array.Empty<string>();
                 if (existingTags.Contains(removed.Uid))
                 {
-                    selectedItem.FileTags = existingTags.Except(new[] { removed.Uid }).ToArray();
+                    var tagList = existingTags.Except(new[] { removed.Uid }).ToArray();
+                    selectedItem.FileTags = tagList.Any() ? tagList : null;
                 }
             }
         }