Readded display of MessageID from push message the and timestamp sent included in the push message rather than the time received.

Steve Trease · Steve Trease · commit 0b6fe11a3321 · 2015-05-04T14:00:21.000+01:00
diff --git a/Swift Push 3.xcodeproj/project.xcworkspace/xcuserdata/steve.xcuserdatad/UserInterfaceState.xcuserstate b/Swift Push 3.xcodeproj/project.xcworkspace/xcuserdata/steve.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Swift Push 3/AppDelegate.swift b/Swift Push 3/AppDelegate.swift
@@ -9,6 +9,7 @@
 import UIKit
 import CoreData
 
+
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
                             
@@ -62,6 +63,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         NSUserDefaults.standardUserDefaults().synchronize()
         
         let receipt = NSBundle.mainBundle().appStoreReceiptURL?.lastPathComponent
+        let mode = receipt
         let versionNumber: AnyObject? = NSBundle.mainBundle().infoDictionary?["CFBundleVersion"]
         
         // register device token with push service
@@ -70,7 +72,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         request.HTTPMethod = "POST"
         var bodyData = "token=\(deviceToken.description)"
         bodyData += "&device=\(UIDevice.currentDevice().name)"
-        bodyData += "&mode=\(receipt!)"
+        bodyData += "&mode=\(mode!)"
         bodyData += "&version=\(versionNumber!)"
         request.HTTPBody = bodyData.dataUsingEncoding(NSUTF8StringEncoding)
         var connection = NSURLConnection(request: request, delegate: self, startImmediately: false)
@@ -101,16 +103,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         if let aps = userInfo["aps"] as? NSDictionary {
             if let alert = aps["alert"] as? String {
                 item.alert = alert
+                println ("alert: \(alert)")
             }
         }
-        
-        // var payload = userInfo.objectForKey("payload") as String
-        // var timeStamp = userInfo.objectForKey("timestamp") as String
-        // var messageID = userInfo.objectForKey("messageID") as Int
-        
-        // item.payload = alert
-        // item.timeStamp = NSDate()
-        // item.messageID = messageID
+        if let messageID = userInfo["messageID"] as? Int {
+            item.messageID = messageID
+            println ("messageID: \(messageID)")
+        }
+        if let timeStamp = userInfo["timestamp"] as? NSTimeInterval {
+            item.timeStamp = NSDate (timeIntervalSince1970: timeStamp)
+            println ("timestamp: \(timeStamp)")
+        }
         
         notifications.insert(item, atIndex: 0)
         if (notifications.count > maxNotifications) {
diff --git a/Swift Push 3/Info.plist b/Swift Push 3/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>295</string>
+	<string>318</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIBackgroundModes</key>
diff --git a/Swift Push 3/NotificationData.swift b/Swift Push 3/NotificationData.swift
@@ -16,5 +16,5 @@ class NotificationData {
     var alert: String = ""
     // var payload: String = ""
     var timeStamp = NSDate()        // timestamp the date/time the notification record is created
-    // var messageID: Int = 0
+    var messageID: Int = 0
 }
diff --git a/Swift Push 3/NotificationsTableViewController.swift b/Swift Push 3/NotificationsTableViewController.swift
@@ -93,7 +93,11 @@ class NotificationsTableViewController: UITableViewController, UISearchBarDelega
         cell.detailTextLabel?.numberOfLines = 0
         
         cell.textLabel?.text = notification.alert as String
-        cell.detailTextLabel?.text = NSDateFormatter.localizedStringFromDate(notification.timeStamp, dateStyle: .MediumStyle, timeStyle: .ShortStyle)
+        // var detailTextLabel: String = NSDateFormatter.localizedStringFromDate(notification.timeStamp, dateStyle: .MediumStyle, timeStyle: .ShortStyle) as String
+        // etailTextLabel += " \(notification.messageID) "
+        // ell.detailTextLabel?.text = detailTextLabel
+        cell.detailTextLabel?.text = NSDateFormatter.localizedStringFromDate(notification.timeStamp, dateStyle: .MediumStyle, timeStyle: .ShortStyle) as String + " (\(notification.messageID))"
+        
         
         if (indexPath.row % 2 == 0 ) {
             cell.backgroundColor = UIColor(white: 0.95, alpha: 1.0)
diff --git a/Swift Push 3/Settings.bundle/Root.plist b/Swift Push 3/Settings.bundle/Root.plist
@@ -6,7 +6,7 @@
 	<array>
 		<dict>
 			<key>DefaultValue</key>
-			<string>295</string>
+			<string>318</string>
 			<key>Key</key>
 			<string>CurrentBuildNumber</string>
 			<key>Title</key>

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@ class NotificationData {`
`16`	`16`	`var alert: String = ""`
`17`	`17`	`// var payload: String = ""`
`18`	`18`	`var timeStamp = NSDate() // timestamp the date/time the notification record is created`
`19`		`- // var messageID: Int = 0`
	`19`	`+ var messageID: Int = 0`
`20`	`20`	`}`