Fix group being overwritten in unpackaged apps

andrewleader · andrewleader · commit 93e0f349034f · 2021-03-12T13:06:45.000-08:00
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotifierCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotifierCompat.cs
@@ -143,10 +143,10 @@ private void PreprocessToast(ToastNotification notification)
             // For apps that don't have identity...
             if (!DesktopBridgeHelpers.HasIdentity())
             {
-                // If tag is specified
-                if (!string.IsNullOrEmpty(notification.Tag))
+                // If tag is specified and group isn't specified
+                if (!string.IsNullOrEmpty(notification.Tag) && string.IsNullOrEmpty(notification.Group))
                 {
-                    // If group isn't specified, we have to add a group since otherwise can't remove without a group
+                    // We have to add a group since otherwise can't remove without a group
                     notification.Group = ToastNotificationManagerCompat.DEFAULT_GROUP;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -143,10 +143,10 @@ private void PreprocessToast(ToastNotification notification)`
`143`	`143`	`// For apps that don't have identity...`
`144`	`144`	`if (!DesktopBridgeHelpers.HasIdentity())`
`145`	`145`	`{`
`146`		`- // If tag is specified`
`147`		`- if (!string.IsNullOrEmpty(notification.Tag))`
	`146`	`+ // If tag is specified and group isn't specified`
	`147`	`+ if (!string.IsNullOrEmpty(notification.Tag) && string.IsNullOrEmpty(notification.Group))`
`148`	`148`	`{`
`149`		`- // If group isn't specified, we have to add a group since otherwise can't remove without a group`
	`149`	`+ // We have to add a group since otherwise can't remove without a group`
`150`	`150`	`notification.Group = ToastNotificationManagerCompat.DEFAULT_GROUP;`
`151`	`151`	`}`
`152`	`152`	`}`