Strip <> and whitespace from device tokens before posting

stevetrease · stevetrease · commit b631b8699ba6 · 2016-07-02T22:37:37.000+01:00
diff --git a/Swift Push/AppDelegate.swift b/Swift Push/AppDelegate.swift
@@ -73,21 +73,22 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     
     
     func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken:Data) {
-        // let existingToken: AnyObject? = NSUserDefaults.standardUserDefaults().objectForKey("deviceToken")
+        var token: String = deviceToken.description
+        token = token.replacingOccurrences(of: "[^0-9 ]", with: "")
         
-        print("device token is " + deviceToken.description)
-        UserDefaults.standard().set(deviceToken.description as String, forKey:"deviceToken")
+        print("device token is \(token)")
+        UserDefaults.standard().set(token as String, forKey:"deviceToken")
         UserDefaults.standard().synchronize()
         
-        newRecord("Device token is \(deviceToken.description)", alert: false, messageID: 0)
+        newRecord("Device token is \(token)", alert: false, messageID: 0)
         
         let receipt = Bundle.main().appStoreReceiptURL?.lastPathComponent
         let mode = receipt
         let versionNumber: AnyObject? = Bundle.main().infoDictionary?["CFBundleVersion"]
         
         var request = URLRequest(url: URL(string: "https://www.trease.eu/ibeacon/swiftpush/")!)
         request.httpMethod = "POST"
-        var bodyData = "token=\(deviceToken.description)"
+        var bodyData = "token=\(token)"
         bodyData += "&device=\(UIDevice.current().name)"
         bodyData += "&mode=\(mode!)"
         bodyData += "&version=\(versionNumber!)"
diff --git a/Swift Push/Info.plist b/Swift Push/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>445</string>
+	<string>448</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIBackgroundModes</key>
diff --git a/Swift Push/Settings.bundle/Root.plist b/Swift Push/Settings.bundle/Root.plist
@@ -6,7 +6,7 @@
 	<array>
 		<dict>
 			<key>DefaultValue</key>
-			<integer>445</integer>
+			<integer>448</integer>
 			<key>Key</key>
 			<string>maximumRecords</string>
 			<key>MaximumValue</key>
