Added .alert and .message attributes to notification data type and changed view controller to display the message text

stevetrease · Steve Trease · commit df1b540debc9 · 2015-09-07T17:38:24.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
@@ -114,6 +114,7 @@ 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)")
             }
         }
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>589</string>
+	<string>590</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIBackgroundModes</key>
diff --git a/Swift Push 4/MasterViewController.swift b/Swift Push 4/MasterViewController.swift
@@ -94,7 +94,7 @@ class MasterViewController: UITableViewController, UISearchResultsUpdating {
         cell.textLabel?.numberOfLines = 0
         cell.detailTextLabel?.numberOfLines = 0
         
-        cell.textLabel?.text = notification.alert as String
+        cell.textLabel?.text = notification.message as String
         cell.detailTextLabel?.text = NSDateFormatter.localizedStringFromDate(notification.timeStampSent, dateStyle: .MediumStyle, timeStyle: .ShortStyle) as String
             
         if (notification.messageID != 0) {
@@ -122,7 +122,7 @@ class MasterViewController: UITableViewController, UISearchResultsUpdating {
         } else {
             self.filteredNotifications = notifications.filter({( notification: NotificationData) -> Bool in
                 // let categoryMatch = (scope == "All") || (notification.alert == scope)
-                let stringMatch = notification.alert.rangeOfString(searchController.searchBar.text!, options: .CaseInsensitiveSearch)
+                let stringMatch = notification.message.rangeOfString(searchController.searchBar.text!, options: .CaseInsensitiveSearch)
                 return (stringMatch != nil)
             })
         }
diff --git a/Swift Push 4/NotificationData.swift b/Swift Push 4/NotificationData.swift
@@ -13,6 +13,7 @@ let maxNotifications = 128
 
 class NotificationData {
     var alert: String = ""
+    var message: String = ""
     // var payload: String = ""
     var timeStampSent = NSDate()
     var timeStampReceived = NSDate()
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>589</string>
+			<string>590</string>
 			<key>Key</key>
 			<string>CurrentBuildNumber</string>
 			<key>Title</key>

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`114`	`114`	`if let aps = userInfo["aps"] as? NSDictionary {`
`115`	`115`	`if let alert = aps["alert"] as? String {`
`116`	`116`	`item.alert = alert`
	`117`	`+ item.message = alert`
`117`	`118`	`print ("alert: \(alert)")`
`118`	`119`	`}`
`119`	`120`	`}`