Merge branch 'release/2.0.5'

Author: Alexis Oyama

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -0,0 +1,18 @@
+# How to Contribute
+
+Here are some important resources:
+
+  * [Leanplum Docs](http://leanplum.com/docs) The official Leanplum docs.
+  * Support: Get help at [email protected].
+
+## Submitting changes
+
+Please consider following guidelines before creating a PR:
+
+- Confirm the intention and design of your change by reaching out to your Customer Success Manager or to Leanplum Dev Team through a new Github Issue.
+- Start creating your pull request from `develop` branch
+- Please send a GitHub Pull Request with a clear list of what you've done (read more about [pull requests](https://help.github.com/articles/about-pull-requests/)).  
+- Add unit tests for the code that you have touched.
+- Please follow the existing coding conventions (which are mostly standard of the default IDE).
+- Make sure all of your commits are atomic (one feature per commit).
+- Please adhere to the conventional changelog commit style: https://github.com/commitizen/cz-cli That allows us to easily create change logs.

ISSUE_TEMPLATE.md

@@ -0,0 +1,18 @@
+## Expected Behavior
+
+
+## Actual Behavior
+
+
+## Steps to Reproduce the Problem
+
+  1.
+  1.
+  1.
+
+## Specifications
+
+  - Version:
+  - Platform:
+  - Subsystem:
+

Leanplum-SDK/Classes/Constants.h

@@ -45,7 +45,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.4"
+#define LEANPLUM_SDK_VERSION @"2.0.5"
 #define LEANPLUM_CLIENT @"ios"
 
 // Can upload up to 100 files or 50 MB per request.

Leanplum-SDK/Classes/Constants.m

@@ -315,13 +315,17 @@ void leanplumInternalError(NSException *e)
     int userCodeBlocks = [[[[NSThread currentThread] threadDictionary]
                            objectForKey:LP_USER_CODE_BLOCKS] intValue];
     if (userCodeBlocks <= 0) {
-        [[LeanplumRequest post:LP_METHOD_LOG
-                        params:@{
-                                 LP_PARAM_TYPE: LP_VALUE_SDK_ERROR,
-                                 LP_PARAM_MESSAGE: [e description],
-                                 @"stackTrace": [[e callStackSymbols] description] ?: @"",
-                                 LP_PARAM_VERSION_NAME: versionName
-                                 }] send];
+        @try {
+            [[LeanplumRequest post:LP_METHOD_LOG
+                            params:@{
+                                     LP_PARAM_TYPE: LP_VALUE_SDK_ERROR,
+                                     LP_PARAM_MESSAGE: [e description],
+                                     @"stackTrace": [[e callStackSymbols] description] ?: @"",
+                                     LP_PARAM_VERSION_NAME: versionName
+                                     }] send];
+        } @catch (NSException *e) {
+            // This empty try/catch is needed to prevent crash <-> loop.
+        }
         NSLog(@"Leanplum: INTERNAL ERROR: %@\n%@", e, [e callStackSymbols]);
     } else {
         NSLog(@"Leanplum: Caught exception in callback code: %@\n%@", e, [e callStackSymbols]);

Leanplum-SDK/Classes/LPDatabase.m

@@ -47,20 +47,21 @@ - (id)init
 /**
  * Create/Open SQLite database.
  */
-- (void)initSQLite
+- (sqlite3 *)initSQLite
 {
     const char *sqliteFilePath = [[LPDatabase sqliteFilePath] UTF8String];
     int result = sqlite3_open(sqliteFilePath, &sqlite);
     if (result != SQLITE_OK) {
         [self handleSQLiteError:@"SQLite fail to open" errorResult:result query:nil];
-        return;
+        return nil;
     }
     retryOnCorrupt = NO;
 
     // Create tables.
     [self runQuery:@"CREATE TABLE IF NOT EXISTS event ("
                         "data TEXT NOT NULL"
                     "); PRAGMA user_version = 1;"];
+    return sqlite;
 }
 
 - (void)dealloc
@@ -97,18 +98,9 @@ - (void)handleSQLiteError:(NSString *)errorName errorResult:(int)result query:(N
     }
     LPLog(LPError, @"%@: %@", errorName, reason);
 
-    // Send error log. Using willSendErrorLog to prevent infinte loop.
-    if (!willSendErrorLog) {
-        willSendErrorLog = YES;
-        NSException *exception = [NSException exceptionWithName:errorName
-                                                         reason:reason
-                                                       userInfo:nil];
-        leanplumInternalError(exception);
-    }
-    
-    // If SQLite is corrupted create a new one.
+    // If SQLite is corrupted, create a new one.
     // Using retryOnCorrupt to prevent infinite loop.
-    if (result == SQLITE_CORRUPT || !retryOnCorrupt) {
+    if (result == SQLITE_CORRUPT && !retryOnCorrupt) {
         [[NSFileManager defaultManager] removeItemAtPath:[LPDatabase sqliteFilePath] error:nil];
         retryOnCorrupt = YES;
         [self initSQLite];
@@ -122,15 +114,15 @@ - (void)handleSQLiteError:(NSString *)errorName errorResult:(int)result query:(N
 - (sqlite3_stmt *)sqliteStatementFromQuery:(NSString *)query
                                bindObjects:(NSArray *)objectsToBind
 {
-    if (!query) {
+    // Retry creating SQLite.
+    if (!query || (!sqlite && [self initSQLite])) {
         return nil;
     }
 
     sqlite3_stmt *statement;
     int __block result = sqlite3_prepare_v2(sqlite, [query UTF8String], -1, &statement, NULL);
     if (result != SQLITE_OK) {
-        LPLog(LPError, @"Preparing '%@': %s (%d)", query, sqlite3_errmsg(sqlite),
-              result);
+        [self handleSQLiteError:@"SQLite fail to prepare" errorResult:result query:query];
         return nil;
     }
 
@@ -147,8 +139,8 @@ - (sqlite3_stmt *)sqliteStatementFromQuery:(NSString *)query
                                    SQLITE_TRANSIENT);
 
         if (result != SQLITE_OK) {
-            LPLog(LPError, @"Binding %@ to %ld: %s (%d)", obj, idx+1, sqlite3_errmsg(sqlite),
-                  result);
+            NSString *message = [NSString stringWithFormat:@"SQLite fail to bind %@ to %ld", obj, idx+1];
+            [self handleSQLiteError:message errorResult:result query:query];
         }
     }];
 
@@ -162,18 +154,26 @@ - (void)runQuery:(NSString *)query
 
 - (void)runQuery:(NSString *)query bindObjects:(NSArray *)objectsToBind
 {
+    // Retry creating SQLite.
+    if (!sqlite && [self initSQLite]) {
+        return;
+    }
+    
     @synchronized (self) {
-        sqlite3_stmt *statement = [self sqliteStatementFromQuery:query bindObjects:objectsToBind];
-        if (!statement) {
-            return;
-        }
-        
-        int result = sqlite3_step(statement);
-        if (result != SQLITE_DONE) {
-            [self handleSQLiteError:@"SQLite fail to run query" errorResult:result query:query];
+        @try {
+            sqlite3_stmt *statement = [self sqliteStatementFromQuery:query bindObjects:objectsToBind];
+            if (!statement) {
+                return;
+            }
+            int result = sqlite3_step(statement);
+            if (result != SQLITE_DONE) {
+                LPLog(LPError, @"SQLite fail to run query.");
+            }
+            sqlite3_finalize(statement);
+        } @catch (NSException *e) {
+            LPLog(LPError, @"SQLite operation failed.");
+            // TODO: Make sure to catch this when new logging is in place,
         }
-        willSendErrorLog = NO;
-        sqlite3_finalize(statement);
     }
 }
 
@@ -184,6 +184,11 @@ - (NSArray *)rowsFromQuery:(NSString *)query
 
 - (NSArray *)rowsFromQuery:(NSString *)query bindObjects:(NSArray *)objectsToBind
 {
+    // Retry creating SQLite.
+    if (!sqlite && [self initSQLite]) {
+        return @[];
+    }
+    
     @synchronized (self) {
         NSMutableArray *rows = [NSMutableArray new];
         sqlite3_stmt *statement = [self sqliteStatementFromQuery:query

Leanplum-SDK/Classes/LPMessageTemplates.m

@@ -95,11 +95,11 @@
 #define LPMT_DEFAULT_NO_BUTTON_TEXT @"No"
 #define LPMT_DEFAULT_LATER_BUTTON_TEXT @"Maybe Later"
 #define LPMT_DEFAULT_URL @"http://www.example.com"
-#define LPMT_DEFAULT_CLOSE_URL @"http://leanplum:close"
-#define LPMT_DEFAULT_OPEN_URL @"http://leanplum:loadFinished"
-#define LPMT_DEFAULT_TRACK_URL @"http://leanplum:track"
-#define LPMT_DEFAULT_ACTION_URL @"http://leanplum:runAction"
-#define LPMT_DEFAULT_TRACK_ACTION_URL @"http://leanplum:runTrackedAction"
+#define LPMT_DEFAULT_CLOSE_URL @"http://leanplum/close"
+#define LPMT_DEFAULT_OPEN_URL @"http://leanplum/loadFinished"
+#define LPMT_DEFAULT_TRACK_URL @"http://leanplum/track"
+#define LPMT_DEFAULT_ACTION_URL @"http://leanplum/runAction"
+#define LPMT_DEFAULT_TRACK_ACTION_URL @"http://leanplum/runTrackedAction"
 #define LPMT_DEFAULT_HAS_DISMISS_BUTTON YES
 #define LPMT_DEFAULT_APP_ICON @"__iOSAppIcon-PrimaryIcon.png"
 

Leanplum-SDK/Classes/LPVarCache.m

@@ -511,60 +511,60 @@ + (void)applyVariableDiffs:(NSDictionary *)diffs_
                  maybeDownloadFiles];
             }
         }
-    }
 
-    // If LeanplumLocation is linked in, setup region monitoring.
-    if (messages_ || regions_) {
-        if (!regionInitBlock) {
-                if ([LPConstantsState sharedState].isDevelopmentModeEnabled) {
-                    if ([regions_ count] > 0) {
-                        NSLog(@"Leanplum: Regions have been defined in dashboard, but the app is not built to handle them.");
-                        NSLog(@"Leanplum: Add LeanplumLocation.framework or LeanplumBeacon.framework to Build Settings -> Link Binary With Libraries.");
-                        NSLog(@"Leanplum: Disregard warning if there are no plans to utilize iBeacon or Geofencing within the app");
+        // If LeanplumLocation is linked in, setup region monitoring.
+        if (messages_ || regions_) {
+            if (!regionInitBlock) {
+                    if ([LPConstantsState sharedState].isDevelopmentModeEnabled) {
+                        if ([regions_ count] > 0) {
+                            NSLog(@"Leanplum: Regions have been defined in dashboard, but the app is not built to handle them.");
+                            NSLog(@"Leanplum: Add LeanplumLocation.framework or LeanplumBeacon.framework to Build Settings -> Link Binary With Libraries.");
+                            NSLog(@"Leanplum: Disregard warning if there are no plans to utilize iBeacon or Geofencing within the app");
+                        }
                     }
-                }
-        } else {
-            NSSet *foregroundRegionNames;
-            NSSet *backgroundRegionNames;
-            [LPActionManager getForegroundRegionNames:&foregroundRegionNames
-                             andBackgroundRegionNames:&backgroundRegionNames];
-            regionInitBlock([LPVarCache regions], foregroundRegionNames, backgroundRegionNames);
+            } else {
+                NSSet *foregroundRegionNames;
+                NSSet *backgroundRegionNames;
+                [LPActionManager getForegroundRegionNames:&foregroundRegionNames
+                                 andBackgroundRegionNames:&backgroundRegionNames];
+                regionInitBlock([LPVarCache regions], foregroundRegionNames, backgroundRegionNames);
+            }
         }
-    }
-
-    BOOL interfaceUpdated = NO;
-    if (updateRules_) {
-        interfaceUpdated = ![updateRules_ isEqual:updateRulesDiffs];
-        updateRulesDiffs = [updateRules_ mutableCopy];
-        [self downloadUpdateRulesImages];
-    }
-    
-    BOOL eventsUpdated = NO;
-    if (eventRules_ && ![eventRules_ isKindOfClass:NSNull.class]) {
-        eventsUpdated = ![eventRules_ isEqual:eventRulesDiffs];
-        eventRulesDiffs = eventRules_;
-    }
-
-    if (variants_) {
-        variants = variants_;
-    }
-    
-    contentVersion++;
 
-    if (!silent) {
-        [self saveDiffs];
-
-        hasReceivedDiffs = YES;
-        if (updateBlock) {
-            updateBlock();
+        BOOL interfaceUpdated = NO;
+        if (updateRules_) {
+            interfaceUpdated = ![updateRules_ isEqual:updateRulesDiffs];
+            updateRulesDiffs = [updateRules_ mutableCopy];
+            [self downloadUpdateRulesImages];
         }
 
-        if (interfaceUpdated) {
-            interfaceUpdateBlock();
+        BOOL eventsUpdated = NO;
+        if (eventRules_ && ![eventRules_ isKindOfClass:NSNull.class]) {
+            eventsUpdated = ![eventRules_ isEqual:eventRulesDiffs];
+            eventRulesDiffs = eventRules_;
+        }
+
+        if (variants_) {
+            variants = variants_;
         }
 
-        if (eventsUpdated) {
-            eventsUpdateBlock();
+        contentVersion++;
+
+        if (!silent) {
+            [self saveDiffs];
+
+            hasReceivedDiffs = YES;
+            if (updateBlock) {
+                updateBlock();
+            }
+            
+            if (interfaceUpdated) {
+                interfaceUpdateBlock();
+            }
+            
+            if (eventsUpdated) {
+                eventsUpdateBlock();
+            }
         }
     }
 }

Leanplum-SDK/Classes/Leanplum.h

@@ -1,6 +1,6 @@
 //
 //  Leanplum.h
-//  Leanplum iOS SDK Version 2.0.4
+//  Leanplum iOS SDK Version 2.0.5
 //
 //  Copyright (c) 2012 Leanplum, Inc. All rights reserved.
 //