Include OldSubscriptionId and SubscriptionExpiryUtc in notification r…

…esult for expired Windows and Windows Phone subscriptions.
ezar · Apr 29, 2014 · d790f98 · d790f98
1 parent 19216ea
commit d790f98
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/PushSharp.Windows/WindowsPushChannel.cs b/PushSharp.Windows/WindowsPushChannel.cs
@@ -243,11 +243,19 @@ void HandleStatus(WindowsNotificationStatus status, SendNotificationCallbackDele
 				callback(this, new SendNotificationResult(status.Notification));
 				return;
 			}
-			else if (status.HttpStatus == HttpStatusCode.NotFound || status.HttpStatus == HttpStatusCode.Gone) //404 or 410
+
+			if (status.HttpStatus == HttpStatusCode.NotFound || status.HttpStatus == HttpStatusCode.Gone) //404 or 410
 			{
-				callback(this, new SendNotificationResult(status.Notification, false, new Exception("Device Subscription Expired")) { IsSubscriptionExpired = true });
+				callback(this, new SendNotificationResult(status.Notification, false, new Exception("Device Subscription Expired"))
+				{
+					IsSubscriptionExpired = true,
+					OldSubscriptionId = status.Notification.ChannelUri,
+					SubscriptionExpiryUtc = DateTime.UtcNow
+				});
+
+				return;
 			}
-				
+
 			callback(this, new SendNotificationResult(status.Notification, false, new WindowsNotificationSendFailureException(status)));
 		}
 

diff --git a/PushSharp.WindowsPhone/WindowsPhonePushChannel.cs b/PushSharp.WindowsPhone/WindowsPhonePushChannel.cs
@@ -165,25 +165,31 @@ WindowsPhoneMessageStatus ParseStatus(HttpWebResponse resp, WindowsPhoneNotifica
 		}
 
 		void HandleStatus(SendNotificationCallbackDelegate callback, WindowsPhoneMessageStatus status, WindowsPhoneNotification notification = null)
-		{	
+		{
+			if (callback == null)
+				return;
+
 			if (status.SubscriptionStatus == WPSubscriptionStatus.Expired)
 			{
-				if (callback != null)
-					callback(this, new SendNotificationResult(notification, false, new Exception("Device Subscription Expired")) { IsSubscriptionExpired = true });
+				callback(this, new SendNotificationResult(notification, false, new Exception("Device Subscription Expired"))
+				{
+					IsSubscriptionExpired = true,
+					OldSubscriptionId = notification != null ? notification.EndPointUrl : null,
+					SubscriptionExpiryUtc = DateTime.UtcNow
+				});
 
 				return;
 			}
 
 			if (status.HttpStatus == HttpStatusCode.OK
 				&& status.NotificationStatus == WPNotificationStatus.Received)
 			{
-				if (callback != null)
-					callback(this, new SendNotificationResult(notification));
+				callback(this, new SendNotificationResult(notification));
+
 				return;
 			}
 
-			if (callback != null)
-				callback(this, new SendNotificationResult(status.Notification, false, new WindowsPhoneNotificationSendFailureException(status)));
+			callback(this, new SendNotificationResult(status.Notification, false, new WindowsPhoneNotificationSendFailureException(status)));
 		}
 
 		public void Dispose()