Merge branch 'master' into bugfix/span2d-copyto-exception-info

Author: michael-hawker

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

@@ -27,6 +27,11 @@ internal class Win32AppInfo
 
         public string Aumid { get; set; }
 
+        /// <summary>
+        /// Gets the AUMID before it was fixed up with the backslash issue
+        /// </summary>
+        public string Pre7_0_1Aumid { get; private set; }
+
         public string DisplayName { get; set; }
 
         public string IconPath { get; set; }
@@ -39,8 +44,29 @@ public static Win32AppInfo Get()
             IApplicationResolver appResolver = (IApplicationResolver)new CAppResolver();
             appResolver.GetAppIDForProcess(Convert.ToUInt32(process.Id), out string appId, out _, out _, out _);
 
-            // Use app ID (or hashed app ID) as AUMID
-            string aumid = appId.Length > AUMID_MAX_LENGTH ? HashAppId(appId) : appId;
+            string aumid;
+            string pre7_0_1Aumid = null;
+
+            // If the app ID is too long
+            if (appId.Length > AUMID_MAX_LENGTH)
+            {
+                // Hash the AUMID
+                aumid = HashAppId(appId);
+            }
+
+            // Else if it contains a backslash
+            else if (appId.Contains('\\'))
+            {
+                // For versions 19042 and older of Windows 10, we can't use backslashes - Issue #3870
+                // So we change it to not include those
+                aumid = appId.Replace('\\', '/');
+                pre7_0_1Aumid = appId;
+            }
+            else
+            {
+                // Use as-is
+                aumid = appId;
+            }
 
             // Then try to get the shortcut (for display name and icon)
             IShellItem shortcutItem = null;
@@ -73,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
@@ -103,12 +129,13 @@ 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()
             {
                 Aumid = aumid,
+                Pre7_0_1Aumid = pre7_0_1Aumid,
                 DisplayName = displayName,
                 IconPath = iconPath
             };
@@ -136,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
             {
@@ -150,7 +177,7 @@ private static string ExtractAndObtainIconFromPath(string pathToExtract, string
 
                 using (var bmp = icon.ToBitmap())
                 {
-                    return SaveIconToAppPath(bmp, appId);
+                    return SaveIconToAppPath(bmp, aumid);
                 }
             }
             catch
@@ -159,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));
@@ -182,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

@@ -27,6 +27,7 @@ public static class ToastNotificationManagerCompat
 #if WIN32
         private const string TOAST_ACTIVATED_LAUNCH_ARG = "-ToastActivated";
         private const string REG_HAS_SENT_NOTIFICATION = "HasSentNotification";
+        private const string REG_HAS_7_0_1_FIX = "Has7.0.1Fix";
         internal const string DEFAULT_GROUP = "toolkitGroupNull";
 
         private const int CLASS_E_NOAGGREGATION = -2147221232;
@@ -175,6 +176,23 @@ private static void Initialize()
 
                     // Additionally, we need to read whether they've sent a notification before
                     _hasSentNotification = rootKey.GetValue(REG_HAS_SENT_NOTIFICATION) != null;
+
+                    // And read if we've already applied the 7_0_1 fix
+                    bool has7_0_1fix = rootKey.GetValue(REG_HAS_7_0_1_FIX) != null;
+
+                    // If it doesn't have the fix yet
+                    if (!has7_0_1fix)
+                    {
+                        // If the AUMID changed
+                        if (win32AppInfo.Pre7_0_1Aumid != null)
+                        {
+                            // Uninstall the old AUMID
+                            CleanUpOldAumid(win32AppInfo.Pre7_0_1Aumid);
+                        }
+
+                        // Set that it has the fix so we don't try uninstalling again in the future
+                        rootKey.SetValue(REG_HAS_7_0_1_FIX, 1);
+                    }
                 }
 
                 rootKey.SetValue("CustomActivator", string.Format("{{{0}}}", activatorType.GUID));
@@ -183,7 +201,12 @@ private static void Initialize()
 
         private static string GetRegistrySubKey()
         {
-            return @"Software\Classes\AppUserModelId\" + _win32Aumid;
+            return GetRegistrySubKey(_win32Aumid);
+        }
+
+        private static string GetRegistrySubKey(string win32Aumid)
+        {
+            return @"Software\Classes\AppUserModelId\" + win32Aumid;
         }
 
         private static Type CreateActivatorType()
@@ -443,7 +466,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
                         {
@@ -516,21 +539,71 @@ public static void Uninstall()
             {
             }
 
-            if (!DesktopBridgeHelpers.HasIdentity() && _win32Aumid != null)
+            try
             {
-                try
+                // Delete any of the app files
+                var appDataFolderPath = Win32AppInfo.GetAppDataFolderPath(_win32Aumid);
+                if (Directory.Exists(appDataFolderPath))
                 {
-                    // Delete any of the app files
-                    var appDataFolderPath = Win32AppInfo.GetAppDataFolderPath(_win32Aumid);
-                    if (Directory.Exists(appDataFolderPath))
+                    Directory.Delete(appDataFolderPath, recursive: true);
+                }
+            }
+            catch
+            {
+            }
+        }
+
+        private static void CleanUpOldAumid(string oldAumid)
+        {
+            try
+            {
+                // Remove all scheduled notifications (do this first before clearing current notifications)
+                var notifier = ToastNotificationManager.CreateToastNotifier(oldAumid);
+                foreach (var scheduled in notifier.GetScheduledToastNotifications())
+                {
+                    try
+                    {
+                        notifier.RemoveFromSchedule(scheduled);
+                    }
+                    catch
                     {
-                        Directory.Delete(appDataFolderPath, recursive: true);
                     }
                 }
-                catch
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                // Clear all current notifications
+                ToastNotificationManager.History.Clear(oldAumid);
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                // Remove registry key
+                Registry.CurrentUser.DeleteSubKey(GetRegistrySubKey(oldAumid));
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                // Delete any of the app files
+                var appDataFolderPath = Win32AppInfo.GetAppDataFolderPath(oldAumid);
+                if (Directory.Exists(appDataFolderPath))
                 {
+                    Directory.Delete(appDataFolderPath, recursive: true);
                 }
             }
+            catch
+            {
+            }
         }
 #endif