incremental tags support, new JSON writing

Author: shaders

SDK Sample Projects/iPhone-Phonegap/Phonegap-Push/Plugins/PWLocationTracker.m

@@ -6,6 +6,9 @@
 #import "PWLocationTracker.h"
 #import <UIKit/UIKit.h>
 
+//comment this line to disable location tracking for geo-push notifications and dependency on CoreLocation.framework
+#define USE_LOCATION
+
 static CGFloat const kMinUpdateDistance = 10.f;
 static NSTimeInterval const kMinUpdateTime = 10.f;
 
@@ -25,8 +28,10 @@ - (id)init {
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive) name:UIApplicationDidBecomeActiveNotification object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidEnterBackground) name:UIApplicationDidEnterBackgroundNotification object:nil];
 
+#ifdef USE_LOCATION
         self.locationManager = [[CLLocationManager alloc] init];
         self.locationManager.delegate = self;
+#endif
 		//[self.locationManager setDesiredAccuracy:kCLLocationAccuracyHundredMeters];
 
 		self.enabled = false;

SDK Sample Projects/iPhone/Classes/ViewController.m

@@ -47,6 +47,8 @@ - (void) submitAction:(id)sender {
 	NSDictionary *tags = [NSDictionary dictionaryWithObjectsAndKeys:
 						  [aliasField text], @"Alias",
 						  [NSNumber numberWithInt:[favNumField.text intValue]], @"FavNumber",
+//						  @"#pwinc#10", @"price",
+						  [PWTags incrementalTagWithInteger:5], @"price",
 						  nil];
 
 	[[PushNotificationManager pushManager] setTags:tags];

SDK Sample Projects/iPhone/PushNotificationManager/Classes/PWApplicationEventRequest.m

@@ -16,10 +16,10 @@ - (NSString *) methodName {
 - (NSDictionary *) requestDictionary {
 	NSMutableDictionary *dict = [self baseDictionary];
 
-	[dict setObject:[self encodeString:goal] forKey:@"goal"];
+	[dict setObject:goal forKey:@"goal"];
 
 	if(count != nil)
-		[dict setObject:[self encodeInt:[count intValue]] forKey:@"count"];
+		[dict setObject:count forKey:@"count"];
 
 	return dict;
 }

SDK Sample Projects/iPhone/PushNotificationManager/Classes/PWGetNearestZoneRequest.m

@@ -16,8 +16,8 @@ - (NSString *) methodName {
 - (NSDictionary *) requestDictionary {
 	NSMutableDictionary *dict = [self baseDictionary];
 
-	[dict setObject:[self encodeDouble:coordinate.latitude] forKey:@"lat"];
-	[dict setObject:[self encodeDouble:coordinate.longitude] forKey:@"lng"];
+	[dict setObject:[NSNumber numberWithDouble:coordinate.latitude] forKey:@"lat"];
+	[dict setObject:[NSNumber numberWithDouble:coordinate.longitude] forKey:@"lng"];
 
 	return dict;
 }

SDK Sample Projects/iPhone/PushNotificationManager/Classes/PWLocationTracker.m

@@ -6,6 +6,9 @@
 #import "PWLocationTracker.h"
 #import <UIKit/UIKit.h>
 
+//comment this line to disable location tracking for geo-push notifications and dependency on CoreLocation.framework
+#define USE_LOCATION
+
 static CGFloat const kMinUpdateDistance = 10.f;
 static NSTimeInterval const kMinUpdateTime = 10.f;
 
@@ -25,8 +28,10 @@ - (id)init {
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive) name:UIApplicationDidBecomeActiveNotification object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidEnterBackground) name:UIApplicationDidEnterBackgroundNotification object:nil];
 
+#ifdef USE_LOCATION
         self.locationManager = [[CLLocationManager alloc] init];
         self.locationManager.delegate = self;
+#endif
 		//[self.locationManager setDesiredAccuracy:kCLLocationAccuracyHundredMeters];
 
 		self.enabled = false;

SDK Sample Projects/iPhone/PushNotificationManager/Classes/PWPushStatRequest.m

@@ -17,7 +17,7 @@ - (NSDictionary *) requestDictionary {
 	NSMutableDictionary *dict = [self baseDictionary];
 
 	if(hash != nil)
-		[dict setObject:[self encodeString:hash] forKey:@"hash"];
+		[dict setObject:hash forKey:@"hash"];
 
 	return dict;
 }

SDK Sample Projects/iPhone/PushNotificationManager/Classes/PWRegisterDeviceRequest.m

@@ -18,16 +18,19 @@ - (NSString *) methodName {
 - (NSDictionary *) requestDictionary {
 	NSMutableDictionary *dict = [self baseDictionary];
 
-	[dict setObject:[self encodeInt:1] forKey:@"device_type"];
-	[dict setObject:[self encodeString:pushToken] forKey:@"push_token"];
-	[dict setObject:[self encodeString:language] forKey:@"language"];
-	[dict setObject:[self encodeString:timeZone] forKey:@"timezone"];
+	[dict setObject:[NSNumber numberWithInt:1] forKey:@"device_type"];
+	[dict setObject:pushToken forKey:@"push_token"];
+	[dict setObject:language forKey:@"language"];
+	[dict setObject:timeZone forKey:@"timezone"];
 
 	BOOL sandbox = ![PushNotificationManager getAPSProductionStatus];
-	[dict setObject:[self encodeString:sandbox ? @"sandbox" : @"production"] forKey:@"gateway"];
+	if(sandbox)
+		[dict setObject:@"sandbox" forKey:@"gateway"];
+	else
+		[dict setObject:@"production" forKey:@"gateway"];
 
 	NSString * package = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"];
-	[dict setObject:[self encodeString:package] forKey:@"package"];
+	[dict setObject:package forKey:@"package"];
 
 	return dict;
 }

SDK Sample Projects/iPhone/PushNotificationManager/Classes/PWRequest.h

@@ -13,15 +13,7 @@
 @property (nonatomic, copy) NSString *hwid;
 
 - (NSString *) methodName;
-- (NSDictionary *) requestDictionary; //Please note that all values will be processed as strings
-
-
-- (NSString *) encodeString: (NSString *) str;
-- (NSString *) encodeNumber: (NSNumber *) number;
-- (NSString *) encodeObject: (NSObject *) object;
-- (NSString *) encodeInt: (int) number;
-- (NSString *) encodeDouble: (double) number;
-- (NSString *) encodeFloat: (float) number;
+- (NSDictionary *) requestDictionary;
 
 - (NSMutableDictionary *) baseDictionary;
 

SDK Sample Projects/iPhone/PushNotificationManager/Classes/PWRequest.m

@@ -18,34 +18,10 @@ - (NSDictionary *) requestDictionary {
 	return nil;
 }
 
-- (NSString *) encodeString: (NSString *) str { 
-	return [NSString stringWithFormat:@"\"%@\"", [str stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]];
-}
-
-- (NSString *) encodeNumber: (NSNumber *) number {
-	return [number stringValue];
-}
-
-- (NSString *) encodeObject: (NSObject *) object {
-	return [NSString stringWithFormat:@"%@", object];
-}
-
-- (NSString *) encodeInt: (int) number {
-	return [NSString stringWithFormat:@"%d", number];
-}
-
-- (NSString *) encodeDouble: (double) number {
-	return [NSString stringWithFormat:@"%f", number];
-}
-
-- (NSString *) encodeFloat: (float) number {
-	return [NSString stringWithFormat:@"%f", number];
-}
-
 - (NSMutableDictionary *) baseDictionary {
 	NSMutableDictionary *dict = [NSMutableDictionary new];
-	[dict setObject:[self encodeString:appId] forKey:@"application"];
-	[dict setObject:[self encodeString:hwid] forKey:@"hwid"];
+	[dict setObject:appId forKey:@"application"];
+	[dict setObject:hwid forKey:@"hwid"];
 	return [dict autorelease];
 }
 

SDK Sample Projects/iPhone/PushNotificationManager/Classes/PWRequestManager.m

@@ -5,6 +5,7 @@
 //
 
 #import "PWRequestManager.h"
+#import "PW_SBJsonWriter.h"
 
 @implementation PWRequestManager
 
@@ -24,15 +25,13 @@ - (BOOL) sendRequest: (PWRequest *) request {
 }
 
 - (BOOL) sendRequest: (PWRequest *) request error:(NSError **)retError {
-	NSMutableArray *requestStringBuilder = [NSMutableArray new];
 	NSDictionary *requestDict = [request requestDictionary];
 
-	for (NSString *key in [requestDict allKeys]) {
-		[requestStringBuilder addObject:[NSString stringWithFormat:@"\"%@\":%@", key, [requestDict objectForKey:key]]];
-	}
-	NSString *requestString = [requestStringBuilder componentsJoinedByString:@", "];
-	NSString *jsonRequestData = [NSString stringWithFormat:@"{\"request\":{%@}}", requestString];
-	[requestStringBuilder release];
+	PW_SBJsonWriter * json = [[PW_SBJsonWriter alloc] init];
+	NSString *requestString = [json stringWithObject:requestDict];
+	[json release]; json = nil;
+
+	NSString *jsonRequestData = [NSString stringWithFormat:@"{\"request\":%@}", requestString];
 
 #ifdef NOSSL
 	NSString *requestUrl = [kServiceAddressNoSSL stringByAppendingString:[request methodName]];