Differentiate between push and alert message types

stevetrease · Steve Trease · commit 92630021c716 · 2015-09-08T09:40:52.000+01:00
diff --git a/Swift Push 4.xcodeproj/project.xcworkspace/xcuserdata/steve.xcuserdatad/UserInterfaceState.xcuserstate b/Swift Push 4.xcodeproj/project.xcworkspace/xcuserdata/steve.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Swift Push 4/AppDelegate.swift b/Swift Push 4/AppDelegate.swift
@@ -32,6 +32,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // display initial startup message
         var item = NotificationData()
         item.alert = "Swift Push (\(versionNumber!)) starting on " + UIDevice.currentDevice().name
+        item.message = item.alert
         notifications.insert(item, atIndex: 0)
         
         // display an additional set of test notifications
@@ -41,6 +42,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         for i in 1...10 {
             item = NotificationData()
             item.alert = "test data " + formatter.stringFromNumber(i)!
+            item.message = item.alert
             notifications.insert(item, atIndex: 0)
         }
         */
@@ -60,6 +62,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             print("screenshot taken")
             item = NotificationData()
             item.alert = "screenshot taken"
+            item.message = item.alert
             item.timeStampSent = NSDate ()
             notifications.insert(item, atIndex: 0)
         }
@@ -114,14 +117,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         if let aps = userInfo["aps"] as? NSDictionary {
             if let alert = aps["alert"] as? String {
                 item.alert = alert
-                item.message = alert
                 print ("alert: \(alert)")
             }
         }
         if let messageID = userInfo["messageID"] as? Int {
             item.messageID = messageID
             print ("messageID: \(messageID)")
         }
+        if let message = userInfo["payload"] as? String {
+            item.message = message
+            print ("message: \(message)")
+        }
+    
         if let timeStamp = userInfo["timestamp"] as? NSTimeInterval {
             item.timeStampSent = NSDate (timeIntervalSince1970: timeStamp)
             print ("timestamp: \(timeStamp)")
diff --git a/Swift Push 4/Info.plist b/Swift Push 4/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>590</string>
+	<string>593</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIBackgroundModes</key>
diff --git a/Swift Push 4/Settings.bundle/Root.plist b/Swift Push 4/Settings.bundle/Root.plist
@@ -6,7 +6,7 @@
 	<array>
 		<dict>
 			<key>DefaultValue</key>
-			<string>590</string>
+			<string>593</string>
 			<key>Key</key>
 			<string>CurrentBuildNumber</string>
 			<key>Title</key>
