Merge branch 'develop' into release/2.0.6

Author: e7mac

Example/Tests/Classes/UtilitiesTest.m

@@ -79,4 +79,11 @@ - (void)test_base64EncodedStringFromData {
     XCTAssertEqualObjects(base64String, expectedSring);
 }
 
+- (void)test_urlEncodedStringFromString {
+    XCTAssertEqualObjects([Utils urlEncodedStringFromString:@"http://www.leanplum.com"], @"http://www.leanplum.com");
+    XCTAssertEqualObjects([Utils urlEncodedStringFromString:@"http://www.leanplum.com?q=simple_english1&test=2"], @"http://www.leanplum.com?q=simple_english1&test=2");
+    XCTAssertEqualObjects([Utils urlEncodedStringFromString:@"https://ramsey.tfaforms.net/356302?id={}"], @"https://ramsey.tfaforms.net/356302?id=%7B%7D");
+    XCTAssertEqualObjects([Utils urlEncodedStringFromString:@"lomotif://music/月亮"], @"lomotif://music/%E6%9C%88%E4%BA%AE");
+}
+
 @end

Leanplum-SDK/Classes/LPMessageTemplates.m

@@ -29,6 +29,7 @@
 #import "LPMessageTemplates.h"
 #import <QuartzCore/QuartzCore.h>
 #import <StoreKit/StoreKit.h>
+#import "Utils.h"
 
 #define APP_NAME (([[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]) ?: \
     ([[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"]))
@@ -323,7 +324,7 @@ - (void)defineActions
              withResponder:^BOOL(LPActionContext *context) {
                  @try {
                      dispatch_async(dispatch_get_main_queue(), ^{
-                         NSString *encodedURLString = [[context stringNamed:LPMT_ARG_URL] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLHostAllowedCharacterSet]];
+                         NSString *encodedURLString = [Utils urlEncodedStringFromString:[context stringNamed:LPMT_ARG_URL]];
                          NSURL *url = [NSURL URLWithString: encodedURLString];
                          if ([[UIApplication sharedApplication] respondsToSelector:@selector(openURL:options:completionHandler:)]) {
                              [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];

Leanplum-SDK/Classes/Utils.h

@@ -47,4 +47,10 @@
  */
 + (NSString *)base64EncodedStringFromData:(NSData *)data;
 
+/**
+ * Returns unicode encoded string for supporting international
+ * characters in URL
+ */
++ (NSString *)urlEncodedStringFromString:(NSString *)urlString;
+
 @end

Leanplum-SDK/Classes/Utils.m

@@ -71,4 +71,14 @@ + (NSString *)base64EncodedStringFromData:(NSData *)data
 
 }
 
++(NSString *)urlEncodedStringFromString:(NSString *)urlString {
+    NSString *unreserved = @":-._~/?&=";
+    NSMutableCharacterSet *allowed = [NSMutableCharacterSet
+                                      alphanumericCharacterSet];
+    [allowed addCharactersInString:unreserved];
+    return [urlString
+            stringByAddingPercentEncodingWithAllowedCharacters:
+            allowed];
+}
+
 @end