Merge pull request #154 from Resgrid/develop

CU-868a1kgf7 fixing iOS critical notification bug.
Resgrid · Oct 5, 2024 · 9c35c06 · 9c35c06
2 parents c2a3e6d + e87254a
commit 9c35c06
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/Providers/Resgrid.Providers.Bus/Models/ApnsHeader.cs b/Providers/Resgrid.Providers.Bus/Models/ApnsHeader.cs
@@ -8,6 +8,6 @@ public class ApnsHeader
 		public ApnsAlert alert { get; set; }
 		public string category { get; set; }
 		public int badge { get; set; }
-		public string sound { get; set; }
+		public ApnsSound sound { get; set; }
 	}
 }
diff --git a/Providers/Resgrid.Providers.Bus/Models/ApnsSound.cs b/Providers/Resgrid.Providers.Bus/Models/ApnsSound.cs
@@ -0,0 +1,9 @@
+namespace Resgrid.Providers.Bus.Models
+{
+	public class ApnsSound
+	{
+		public float volume { get; set; }
+		public int critical { get; set; }
+		public string name { get; set; }
+	}
+}
diff --git a/Providers/Resgrid.Providers.Bus/NotificationProvider.cs b/Providers/Resgrid.Providers.Bus/NotificationProvider.cs
@@ -347,6 +347,8 @@ public async Task<NotificationOutcomeState> SendAppleNotification(string title,
 					category = "chats";
 				else if (eventCode.ToLower().StartsWith("g")) // group chat
 					category = "chats";
+				else
+					category = "notifications";
 
 				var apnsPayload = new ApnsPayload
 				{
@@ -359,7 +361,12 @@ public async Task<NotificationOutcomeState> SendAppleNotification(string title,
 						},
 						badge = count,
 						category = category,
-						sound = GetSoundFileNameFromType(Platforms.iPhone, type)
+						sound = new ApnsSound
+						{
+							name = GetSoundFileNameFromType(Platforms.iPhone, type),
+							critical = category == "calls" ? 1 : 0,
+							volume = 1.0f
+						}
 					},
 					eventCode = eventCode,
 					type = type

diff --git a/Providers/Resgrid.Providers.Bus/UnitNotificationProvider.cs b/Providers/Resgrid.Providers.Bus/UnitNotificationProvider.cs
@@ -342,6 +342,8 @@ public async Task<NotificationOutcomeState> SendAppleNotification(string title,
 					category = "chats";
 				else if (eventCode.ToLower().StartsWith("g")) // group chat
 					category = "chats";
+				else
+					category = "notifications";
 
 				var apnsPayload = new ApnsPayload
 				{
@@ -354,7 +356,12 @@ public async Task<NotificationOutcomeState> SendAppleNotification(string title,
 						},
 						badge = count,
 						category = category,
-						sound = GetSoundFileNameFromType(Platforms.iPhone, type, enableCustomSounds)
+						sound = new ApnsSound
+						{
+							name = GetSoundFileNameFromType(Platforms.iPhone, type, enableCustomSounds),
+							critical = category == "calls" ? 1 : 0,
+							volume = 1.0f
+						}
 					},
 					eventCode = eventCode,
 					type = type