Merge branch 'release/2.0.6'

Author: e7mac

Example/Leanplum-SDK.xcodeproj/project.pbxproj

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Example/Leanplum-SDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -278,4 +278,50 @@ - (void)test_push_token
     [self waitForExpectationsWithTimeout:2 handler:nil];
 }
 
+- (void)test_active_period_false
+{
+    LPActionManager *manager = [LPActionManager sharedManager];
+    LPContextualValues *contextualValues = [[LPContextualValues alloc] init];
+    
+    NSDictionary *config = [self messageConfigInActivePeriod:NO];
+
+    LeanplumMessageMatchResult result = [manager shouldShowMessage:@""
+                                                        withConfig:config
+                                                              when:@"event"
+                                                     withEventName:@"ActivePeriodTest"
+                                                  contextualValues:contextualValues];
+    XCTAssertFalse(result.matchedActivePeriod);
+}
+
+- (void)test_active_period_true
+{
+    LPActionManager *manager = [LPActionManager sharedManager];
+    LPContextualValues *contextualValues = [[LPContextualValues alloc] init];
+
+    NSDictionary *config = [self messageConfigInActivePeriod:YES];
+    
+    LeanplumMessageMatchResult result = [manager shouldShowMessage:@""
+                                                        withConfig:config
+                                                              when:@"event"
+                                                     withEventName:@"ActivePeriodTest"
+                                                  contextualValues:contextualValues];
+    XCTAssertTrue(result.matchedActivePeriod);
+
+}
+
+#pragma mark Helpers
+
+-(NSDictionary *)messageConfigInActivePeriod:(BOOL)inActivePeriod
+{
+    NSDictionary *config = @{@"whenLimits":@{@"children":@[]},
+                             @"whenTriggers":@{@"children":@[@{@"noun":@"ActivePeriodTest",
+                                                               @"subject":@"event",
+                                                               }],
+                                               @"verb":@"OR"
+                                               },
+                             @"startTime": inActivePeriod ? @1524507600000 : @956557100000,
+                             @"endTime": inActivePeriod ? @7836202020000 : @956557200000
+                             };
+    return config;
+}
 @end

Example/Tests/Classes/ActionManagerTest.m

@@ -69,10 +69,20 @@ - (void)tearDown
 
 - (void)setMockResult
 {
-    self.mockResult = LeanplumMessageMatchResultMake(YES, NO, YES);
+    self.mockResult = LeanplumMessageMatchResultMake(YES, NO, YES, YES);
     XCTAssertFalse(self.mockResult.matchedUnlessTrigger);
     XCTAssertTrue(self.mockResult.matchedTrigger);
     XCTAssertTrue(self.mockResult.matchedLimit);
+    XCTAssertTrue(self.mockResult.matchedActivePeriod);
+}
+
+- (void)setMockResultActivePeriodFalse
+{
+    self.mockResult = LeanplumMessageMatchResultMake(YES, NO, YES, NO);
+    XCTAssertFalse(self.mockResult.matchedUnlessTrigger);
+    XCTAssertTrue(self.mockResult.matchedTrigger);
+    XCTAssertTrue(self.mockResult.matchedLimit);
+    XCTAssertFalse(self.mockResult.matchedActivePeriod);
 }
 
 - (void)setMockActionManager
@@ -243,4 +253,33 @@ - (void)test_chained_messages
     XCTAssertTrue([chainedMessageId isEqual:@"1"]);
 }
 
+- (void) test_active_period_true
+{
+    NSString *jsonString = [LeanplumHelper retrieve_string_from_file:@"SingleMessage"
+                                                              ofType:@"json"];
+    
+    NSDictionary *messageConfigs = [LPJSON JSONFromString:jsonString];
+    [self runInAppMessagePrioritizationTest:messageConfigs
+                     withExpectedMessageIds:[NSSet setWithObjects: @"1", nil]];
+    
+    // Test creating action context for message id.
+    LPActionContext *context = [Leanplum createActionContextForMessageId:@"1"];
+    XCTAssertEqualObjects(@"Alert", context.actionName);
+}
+
+- (void) test_active_period_false
+{
+    [self setMockResultActivePeriodFalse];
+    [self setMockActionManager];
+    [self setMockLPInternalState];
+    
+    NSString *jsonString = [LeanplumHelper retrieve_string_from_file:@"SingleMessage"
+                                                              ofType:@"json"];
+    
+    NSDictionary *messageConfigs = [LPJSON JSONFromString:jsonString];
+    [self runInAppMessagePrioritizationTest:messageConfigs
+                     withExpectedMessageIds:[NSSet set]];
+    
+}
+
 @end

Example/Tests/Classes/MessagesTest.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

Example/Tests/Classes/UtilitiesTest.m

@@ -28,7 +28,11 @@
 #define IOS_6_SUPPORTED defined(_ARM_ARCH_7) || defined(__i386__) || defined(__LP64__)
 
 #ifndef LP_NOT_TV
-#define LP_NOT_TV (!defined(TARGET_OS_TV) || !TARGET_OS_TV)
+#if (!defined(TARGET_OS_TV) || !TARGET_OS_TV)
+#define LP_NOT_TV 1
+#else
+#define LP_NOT_TV 0
+#endif
 #endif
 
 #define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v)  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
@@ -45,7 +49,7 @@
 #define IS_NOOP ((!IS_SUPPORTED_IOS_VERSION) || IS_JAILBROKEN || [LPConstantsState sharedState].isTestMode || [LPConstantsState sharedState].isInPermanentFailureState)
 #define RETURN_IF_NOOP if (IS_NOOP) return
 
-#define LEANPLUM_SDK_VERSION @"2.0.5"
+#define LEANPLUM_SDK_VERSION @"2.0.6"
 #define LEANPLUM_CLIENT @"ios"
 
 // Can upload up to 100 files or 50 MB per request.

Leanplum-SDK/Classes/Constants.h

@@ -33,10 +33,11 @@ struct LeanplumMessageMatchResult {
     BOOL matchedTrigger;
     BOOL matchedUnlessTrigger;
     BOOL matchedLimit;
+    BOOL matchedActivePeriod;
 };
 typedef struct LeanplumMessageMatchResult LeanplumMessageMatchResult;
 
-LeanplumMessageMatchResult LeanplumMessageMatchResultMake(BOOL matchedTrigger, BOOL matchedUnlessTrigger, BOOL matchedLimit);
+LeanplumMessageMatchResult LeanplumMessageMatchResultMake(BOOL matchedTrigger, BOOL matchedUnlessTrigger, BOOL matchedLimit, BOOL matchedActivePeriod);
 
 typedef enum {
     kLeanplumActionFilterForeground = 0b1,

Leanplum-SDK/Classes/LPActionManager.h

@@ -37,12 +37,13 @@
 #import <objc/runtime.h>
 #import <objc/message.h>
 
-LeanplumMessageMatchResult LeanplumMessageMatchResultMake(BOOL matchedTrigger, BOOL matchedUnlessTrigger, BOOL matchedLimit)
+LeanplumMessageMatchResult LeanplumMessageMatchResultMake(BOOL matchedTrigger, BOOL matchedUnlessTrigger, BOOL matchedLimit, BOOL matchedActivePeriod)
 {
     LeanplumMessageMatchResult result;
     result.matchedTrigger = matchedTrigger;
     result.matchedUnlessTrigger = matchedUnlessTrigger;
     result.matchedLimit = matchedLimit;
+    result.matchedActivePeriod = matchedActivePeriod;
     return result;
 }
 
@@ -1064,7 +1065,7 @@ - (LeanplumMessageMatchResult)shouldShowMessage:(NSString *)messageId
                                   withEventName:(NSString *)eventName
                                contextualValues:(LPContextualValues *)contextualValues
 {
-    LeanplumMessageMatchResult result = LeanplumMessageMatchResultMake(NO, NO, NO);
+    LeanplumMessageMatchResult result = LeanplumMessageMatchResultMake(NO, NO, NO, NO);
 
     // 1. Must not be muted.
     if ([[NSUserDefaults standardUserDefaults] boolForKey:
@@ -1088,6 +1089,17 @@ - (LeanplumMessageMatchResult)shouldShowMessage:(NSString *)messageId
     // 3. Must match all limit conditions.
     NSDictionary *limitConfig = messageConfig[@"whenLimits"];
     result.matchedLimit = [self matchesLimits:limitConfig messageId:messageId];
+
+    // 4. Must be within active period.
+    NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
+    NSTimeInterval startTime = [messageConfig[@"startTime"] doubleValue] / 1000.0;
+    NSTimeInterval endTime = [messageConfig[@"endTime"] doubleValue] / 1000.0;
+    if (startTime && endTime) {
+        result.matchedActivePeriod = now > startTime && now < endTime;
+    } else {
+        result.matchedActivePeriod = YES;
+    }
+    
     return result;
 }
 

Leanplum-SDK/Classes/LPActionManager.m

@@ -50,7 +50,7 @@ - (id)init
 - (sqlite3 *)initSQLite
 {
     const char *sqliteFilePath = [[LPDatabase sqliteFilePath] UTF8String];
-    int result = sqlite3_open(sqliteFilePath, &sqlite);
+    int result = sqlite3_open_v2(sqliteFilePath, &sqlite, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE | SQLITE_OPEN_FULLMUTEX, NULL);
     if (result != SQLITE_OK) {
         [self handleSQLiteError:@"SQLite fail to open" errorResult:result query:nil];
         return nil;
@@ -84,7 +84,11 @@ + (LPDatabase *)sharedDatabase
  */
 + (NSString *)sqliteFilePath
 {
+#if LP_NOT_TV
     return [[LPFileManager documentsDirectory] stringByAppendingPathComponent:LEANPLUM_SQLITE_NAME];
+#else
+    return [[LPFileManager cachesDirectory] stringByAppendingPathComponent:LEANPLUM_SQLITE_NAME];
+#endif
 }
 
 /**
@@ -190,40 +194,45 @@ - (NSArray *)rowsFromQuery:(NSString *)query bindObjects:(NSArray *)objectsToBin
     }
 
     @synchronized (self) {
-        NSMutableArray *rows = [NSMutableArray new];
-        sqlite3_stmt *statement = [self sqliteStatementFromQuery:query
-                                                     bindObjects:objectsToBind];
-        if (!statement) {
-            return @[];
-        }
-        
-        // Iterate through rows.
-        while (sqlite3_step(statement) == SQLITE_ROW) {
-            // Get column data as dictionary where column name is the key
-            // and value will be a blob or a string. This is a safe conversion.
-            // Details: http://www.sqlite.org/c3ref/column_blob.html
-            NSMutableDictionary *columnData = [NSMutableDictionary new];
-            int columnsCount = sqlite3_column_count(statement);
-            for (int i=0; i<columnsCount; i++){
-                char *columnKeyUTF8 = (char *)sqlite3_column_name(statement, i);
-                NSString *columnKey = [NSString stringWithUTF8String:columnKeyUTF8];
-                
-                if (sqlite3_column_type(statement, i) == SQLITE_BLOB) {
-                    NSData *columnBytes = [[NSData alloc] initWithBytes:sqlite3_column_blob(statement, i)
-                                                                 length:sqlite3_column_bytes(statement, i)];
-                    columnData[columnKey] = [NSKeyedUnarchiver unarchiveObjectWithData:columnBytes];
-                } else {
-                    char *columnValueUTF8 = (char *)sqlite3_column_text(statement, i);
-                    if (columnValueUTF8) {
-                        NSString *columnValue = [NSString stringWithUTF8String:columnValueUTF8];
-                        columnData[columnKey] = columnValue;
+        @try {
+            NSMutableArray *rows = [NSMutableArray new];
+            sqlite3_stmt *statement = [self sqliteStatementFromQuery:query
+                                                         bindObjects:objectsToBind];
+            if (!statement) {
+                return @[];
+            }
+            
+            // Iterate through rows.
+            while (sqlite3_step(statement) == SQLITE_ROW) {
+                // Get column data as dictionary where column name is the key
+                // and value will be a blob or a string. This is a safe conversion.
+                // Details: http://www.sqlite.org/c3ref/column_blob.html
+                NSMutableDictionary *columnData = [NSMutableDictionary new];
+                int columnsCount = sqlite3_column_count(statement);
+                for (int i=0; i<columnsCount; i++){
+                    char *columnKeyUTF8 = (char *)sqlite3_column_name(statement, i);
+                    NSString *columnKey = [NSString stringWithUTF8String:columnKeyUTF8];
+                    
+                    if (sqlite3_column_type(statement, i) == SQLITE_BLOB) {
+                        NSData *columnBytes = [[NSData alloc] initWithBytes:sqlite3_column_blob(statement, i)
+                                                                     length:sqlite3_column_bytes(statement, i)];
+                        columnData[columnKey] = [NSKeyedUnarchiver unarchiveObjectWithData:columnBytes];
+                    } else {
+                        char *columnValueUTF8 = (char *)sqlite3_column_text(statement, i);
+                        if (columnValueUTF8) {
+                            NSString *columnValue = [NSString stringWithUTF8String:columnValueUTF8];
+                            columnData[columnKey] = columnValue;
+                        }
                     }
                 }
+                [rows addObject:columnData];
             }
-            [rows addObject:columnData];
+            sqlite3_finalize(statement);
+            return rows;
+        } @catch (NSException *e) {
+            LPLog(LPError, @"SQLite operation failed.");
+            // TODO: Make sure to catch this when new logging is in place,
         }
-        sqlite3_finalize(statement);
-        return rows;
     }
     return @[];
 }