Fixed watchkit target compile fail

Countly · Jul 2, 2015 · 93b7dd9 · 93b7dd9
1 parent 220267f
commit 93b7dd9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Countly.h b/Countly.h
@@ -6,6 +6,7 @@
 // Please visit www.count.ly for more information.
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 @class CountlyEventQueue;
 

diff --git a/CountlyDB.m b/CountlyDB.m
@@ -22,6 +22,7 @@
 #   ifndef COUNTLY_APP_GROUP_ID
 #       error "Application Group Identifier not specified! Please uncomment the line above and specify it."
 #   endif
+#import <WatchKit/WatchKit.h>
 #endif
 
 /*
@@ -83,7 +84,13 @@ -(void)addToQueue:(NSString*)postData
     NSString* watchSegmentationKey = @"[CLY]_apple_watch";
     NSString* watchModel = (WKInterfaceDevice.currentDevice.screenBounds.size.width == 136.0)?@"38mm":@"42mm";
     NSString* segmentation = [NSString stringWithFormat:@"{\"%@\":\"%@\"}", watchSegmentationKey, watchModel];
-    postData = [postData stringByAppendingFormat:@"&segment=%@", CountlyURLEscapedString(segmentation)];
+    NSString* escapedSegmentation = (NSString*)CFBridgingRelease(
+    CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault,
+                                            (CFStringRef)segmentation,
+                                            NULL,
+                                            (CFStringRef)@"!*'();:@&=+$,/?%#[]",
+                                            kCFStringEncodingUTF8));
+    postData = [postData stringByAppendingFormat:@"&segment=%@", escapedSegmentation];
 #endif
 
     [newManagedObject setValue:postData forKey:@"post"];