Merge branch 'andrewleader/notif-settings-fix' into andrewleader/notif-settingsfix-with-cleanup

Author: andrewleader

Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Win32AppInfo.cs

@@ -99,11 +99,11 @@ public static Win32AppInfo Get()
                             if (IsAlphaBitmap(bmp, out var bmpData))
                             {
                                 var alphaBitmap = GetAlphaBitmapFromBitmapData(bmpData);
-                                iconPath = SaveIconToAppPath(alphaBitmap, appId);
+                                iconPath = SaveIconToAppPath(alphaBitmap, aumid);
                             }
                             else
                             {
-                                iconPath = SaveIconToAppPath(bmp, appId);
+                                iconPath = SaveIconToAppPath(bmp, aumid);
                             }
                         }
                         catch
@@ -129,7 +129,7 @@ public static Win32AppInfo Get()
             if (string.IsNullOrWhiteSpace(iconPath))
             {
                 // We use the one from the process
-                iconPath = ExtractAndObtainIconFromCurrentProcess(process, appId);
+                iconPath = ExtractAndObtainIconFromCurrentProcess(process, aumid);
             }
 
             return new Win32AppInfo()
@@ -163,12 +163,12 @@ private static string GetDisplayNameFromCurrentProcess(Process process)
             return process.ProcessName;
         }
 
-        private static string ExtractAndObtainIconFromCurrentProcess(Process process, string appId)
+        private static string ExtractAndObtainIconFromCurrentProcess(Process process, string aumid)
         {
-            return ExtractAndObtainIconFromPath(process.MainModule.FileName, appId);
+            return ExtractAndObtainIconFromPath(process.MainModule.FileName, aumid);
         }
 
-        private static string ExtractAndObtainIconFromPath(string pathToExtract, string appId)
+        private static string ExtractAndObtainIconFromPath(string pathToExtract, string aumid)
         {
             try
             {
@@ -177,7 +177,7 @@ private static string ExtractAndObtainIconFromPath(string pathToExtract, string
 
                 using (var bmp = icon.ToBitmap())
                 {
-                    return SaveIconToAppPath(bmp, appId);
+                    return SaveIconToAppPath(bmp, aumid);
                 }
             }
             catch
@@ -186,11 +186,11 @@ private static string ExtractAndObtainIconFromPath(string pathToExtract, string
             }
         }
 
-        private static string SaveIconToAppPath(Bitmap bitmap, string appId)
+        private static string SaveIconToAppPath(Bitmap bitmap, string aumid)
         {
             try
             {
-                var path = Path.Combine(GetAppDataFolderPath(appId), "Icon.png");
+                var path = Path.Combine(GetAppDataFolderPath(aumid), "Icon.png");
 
                 // Ensure the directories exist
                 Directory.CreateDirectory(Path.GetDirectoryName(path));
@@ -209,9 +209,9 @@ private static string SaveIconToAppPath(Bitmap bitmap, string appId)
         /// Gets the app data folder path within the ToastNotificationManagerCompat folder, used for storing icon assets and any additional data.
         /// </summary>
         /// <returns>Returns a string of the absolute folder path.</returns>
-        public static string GetAppDataFolderPath(string appId)
+        public static string GetAppDataFolderPath(string aumid)
         {
-            string conciseAumid = appId.Contains("\\") ? GenerateGuid(appId) : appId;
+            string conciseAumid = aumid.Contains('\\') || aumid.Contains('/') ? GenerateGuid(aumid) : aumid;
 
             return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "ToastNotificationManagerCompat", "Apps", conciseAumid);
         }

Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs

@@ -465,7 +465,7 @@ public static void Uninstall()
                 {
                     // Remove all scheduled notifications (do this first before clearing current notifications)
                     var notifier = CreateToastNotifier();
-                    foreach (var scheduled in CreateToastNotifier().GetScheduledToastNotifications())
+                    foreach (var scheduled in notifier.GetScheduledToastNotifications())
                     {
                         try
                         {