Added additional error handling for invalid apns device registration ids

PushSharp.Apple/ApnsConnection.cs

@@ -8,6 +8,7 @@
 using System.Threading;
 using System.Net;
 using PushSharp.Core;
+using System.Linq;
 
 namespace PushSharp.Apple
 {
@@ -159,8 +160,24 @@ async Task SendBatch ()
 
             } catch (Exception ex) {
                 Log.Error ("APNS-CLIENT[{0}]: Send Batch Error: Batch ID={1}, Error={2}", id, batchId, ex);
-                foreach (var n in toSend)
-                    n.CompleteFailed (new ApnsNotificationException (ApnsNotificationErrorStatusCode.ConnectionError, n.Notification, ex));
+                var errorNotificationToSend = new List<CompletableApnsNotification> ();
+                //Check to see if any notification items have a bad registration id
+                foreach (var notificationItem in toSend) {
+                    if (!notificationItem.Notification.IsDeviceRegistrationIdValid ())
+                        errorNotificationToSend.Add (notificationItem);
+                }
+                if (errorNotificationToSend.Count > 0) {
+                    //If any devices had a bad registration id assume this exception was caused by those bad ids and requeue the other notifications
+                    foreach (var notificationItem in toSend.Except (errorNotificationToSend))
+                        notifications.Enqueue (notificationItem);
+                    //Report invalid token errors for each invalid registration id
+                    foreach (var n in errorNotificationToSend)
+                        n.CompleteFailed (new ApnsNotificationException (ApnsNotificationErrorStatusCode.InvalidToken, n.Notification, ex));
+                } else {
+                    //If there were no invalid registration ids then report the errors as normal
+                    foreach (var n in toSend)
+                        n.CompleteFailed (new ApnsNotificationException (ApnsNotificationErrorStatusCode.ConnectionError, n.Notification, ex));
+                }
             }
 
             Log.Info ("APNS-Client[{0}]: Sent Batch, waiting for possible response...", id);

PushSharp.Windows/WnsConnection.cs

@@ -64,7 +64,10 @@ public async Task Send (WnsNotification notification)
 
             http.DefaultRequestHeaders.TryAddWithoutValidation ("X-WNS-Type", string.Format ("wns/{0}", notification.Type.ToString().ToLower ()));
 
-            if(!http.DefaultRequestHeaders.Contains("Authorization")) //prevent double values
+            if (notification.Priority != WnsPriority.Unspecified)
+                http.DefaultRequestHeaders.TryAddWithoutValidation("X-WNS-PRIORITY", ((int)notification.Priority).ToString());
+
+            if (!http.DefaultRequestHeaders.Contains("Authorization")) //prevent double values
                 http.DefaultRequestHeaders.TryAddWithoutValidation("Authorization", "Bearer " + accessToken);
 
             if (notification.RequestForStatus.HasValue)

PushSharp.Windows/WnsNotification.cs

@@ -14,6 +14,8 @@ public abstract class WnsNotification : INotification
 
         public abstract WnsNotificationType Type { get; }
 
+        public WnsPriority Priority { get; set; }
+
         public bool IsDeviceRegistrationIdValid ()
         {
             return true;

PushSharp.Windows/WnsNotificationStatus.cs

@@ -43,5 +43,14 @@ public enum WnsNotificationType
         Toast,
         Raw
     }
+
+    public enum WnsPriority
+    {
+        Unspecified = 0,
+        High = 1,
+        Meduim = 2,
+        Low = 3,
+        VeryLow = 4
+    }
 }