@selligent-marketing-cloud/selligent-react-native 2.3.0 → 2.7.0

package/ios/ClientSettings.m

@@ -8,10 +8,11 @@
 @property (nonatomic, strong) NSString *clientId;
 @property (nonatomic, strong) NSString *privateKey;
 @property (nonatomic, strong) NSString *appGroupId;
+@property (nonatomic, strong) NSNumber *shouldAddInAppMessageFromPushToInAppMessageList;
 @property (nonatomic, strong) NSNumber *shouldClearBadge;
 @property (nonatomic, strong) NSNumber *shouldDisplayRemoteNotification;
-@property (nonatomic, strong) NSNumber *configureLocationServices;
 @property (nonatomic, strong) NSNumber *clearCacheIntervalValue;
+@property (nonatomic, strong) NSNumber *remoteMessageDisplayType;
 @property (nonatomic, strong) InAppMessageSettings *inAppMessageSettings;
 
 @end
@@ -24,10 +25,11 @@
     clientSettings.clientId = dictionary[@"clientId"];
     clientSettings.privateKey = dictionary[@"privateKey"];
     clientSettings.appGroupId = dictionary[@"appGroupId"];
+    clientSettings.shouldAddInAppMessageFromPushToInAppMessageList = dictionary[@"addInAppMessageFromPushToInAppMessageList"];
     clientSettings.shouldClearBadge = dictionary[@"shouldClearBadge"];
     clientSettings.shouldDisplayRemoteNotification = dictionary[@"shouldDisplayRemoteNotification"];
-    clientSettings.configureLocationServices = dictionary[@"configureLocationServices"];
     clientSettings.clearCacheIntervalValue = dictionary[@"clearCacheIntervalValue"];
+    clientSettings.remoteMessageDisplayType = dictionary[@"remoteMessageDisplayType"];
     clientSettings.inAppMessageSettings = [InAppMessageSettings fromDictionary:dictionary];
     return clientSettings;
 }

package/ios/EnumMapper.h

@@ -1,13 +1,12 @@
 #import <UIKit/UIKit.h>
 #import "LogLevel.h"
 #import "InAppMessageRefreshType.h"
-#import "LocationAuthorisationStatus.h"
-#import "LocationAuthorisationType.h"
+#import "RemoteMessageDisplayType.h"
 #import "ClearCacheInterval.h"
-#import "SMLocationAuthorisationType.h"
 #import "SMLog.h"
 #import "SMClearCache.h"
 #import "SMInAppRefreshType.h"
+#import "SMRemoteMessageDisplayType.h"
 #import "BackgroundFetchResult.h"
 #import "SMNotificationButtonType.h"
 #import "NotificationButtonType.h"
@@ -24,11 +23,7 @@
 - (SMInAppRefreshType)smInAppRefreshTypeForInAppMessageRefreshType:(InAppMessageRefreshType)inAppMessageRefreshType;
 - (InAppMessageRefreshType)inAppMessageRefreshTypeForSMInAppRefreshType:(SMInAppRefreshType)smInAppRefreshType;
 
-- (SMLocationAuthorisationStatus)smLocationAuthorisationStatusForLocationAuthorisationStatus:(LocationAuthorisationStatus)locationAuthorisationStatus;
-- (LocationAuthorisationStatus)locationAuthorisationStatusForSMLocationAuthorisationStatus:(SMLocationAuthorisationStatus)smLocationAuthorisationType;
-
-- (SMLocationAuthorisationType)smLocationAuthorisationTypeForLocationAuthorisationType:(LocationAuthorisationType)locationAuthorisationType;
-- (LocationAuthorisationType)locationAuthorisationTypeForSMLocationAuthorisationType:(SMLocationAuthorisationType)smLocationAuthorisationType;
+- (SMRemoteMessageDisplayType)smRemoteMessageDisplayTypeForRemoteMessageDisplayType: (RemoteMessageDisplayType)remoteMessageDisplayType;
 
 - (UIBackgroundFetchResult)uiBackgroundFetchResultForBackgroundFetchResult:(BackgroundFetchResult)backgroundFetchResult;
 - (BackgroundFetchResult)backgroundFetchResultForUIBackgroundFetchResult:(UIBackgroundFetchResult)uiBackgroundFetchResult;

package/ios/EnumMapper.m

@@ -4,8 +4,7 @@
     NSDictionary *_logLevelEnumMapping;
     NSDictionary *_clearCacheIntervalEnumMapping;
     NSDictionary *_inAppRefreshTypeEnumMapping;
-    NSDictionary *_locationAuthorisationStatusMapping;
-    NSDictionary *_locationAuthorisationTypeMapping;
+    NSDictionary *_remoteMessageDisplayTypeEnumMapping;
     NSDictionary *_backgroundFetchResult;
     NSDictionary *_notificationButtonTypeMapping;
 }
@@ -43,16 +42,11 @@
                                          @(iamrtHour) : @(kSMIA_RefreshType_Hourly),
                                          @(iamryDay ) : @(kSMIA_RefreshType_Daily),
                                          };
-        _locationAuthorisationStatusMapping = @{
-                                                @(ilasUnknown) : @(kSMLocationAuthorisationStatus_Unknown),
-                                                @(ilasRefused) : @(kSMLocationAuthorisationStatus_Refused),
-                                                @(ilasGrantedInUse) : @(kSMLocationAuthorisationStatus_GrantedInUse),
-                                                @(ilasGrantedAlways) : @(kSMLocationAuthorisationStatus_GrantedAlways),
-                                                };
-        _locationAuthorisationTypeMapping = @{
-                                              @(ilatInUse) : @(kSMLocationAuthorisationType_InUse),
-                                              @(ilatAlways) : @(kSMLocationAuthorisationType_Always),
-                                              };
+        _remoteMessageDisplayTypeEnumMapping = @{
+            @(rmdtAutomatic) : @(kSMRemoteMessageDisplayType_Automatic),
+            @(rmdtNone) : @(kSMRemoteMessageDisplayType_None),
+            @(rmdtNotification) : @(kSMRemoteMessageDisplayType_Notification),
+        };
         _backgroundFetchResult = @{
                                    @(bfrNewData) : @(UIBackgroundFetchResultNewData),
                                    @(bfrNoData) : @(UIBackgroundFetchResultNoData),
@@ -101,20 +95,8 @@
     return (InAppMessageRefreshType) ((NSNumber *)[_inAppRefreshTypeEnumMapping allKeysForObject:@(smInAppRefreshType)].firstObject).integerValue;
 }
 
-- (SMLocationAuthorisationStatus)smLocationAuthorisationStatusForLocationAuthorisationStatus:(LocationAuthorisationStatus)locationAuthorisationStatus {
-    return (SMLocationAuthorisationStatus) ((NSNumber *)_locationAuthorisationStatusMapping[@(locationAuthorisationStatus)]).integerValue;
-}
-
-- (LocationAuthorisationStatus)locationAuthorisationStatusForSMLocationAuthorisationStatus:(SMLocationAuthorisationStatus)smLocationAuthorisationType {
-    return (LocationAuthorisationStatus) ((NSNumber *)[_locationAuthorisationStatusMapping allKeysForObject:@(smLocationAuthorisationType)].firstObject).integerValue;
-}
-
-- (SMLocationAuthorisationType)smLocationAuthorisationTypeForLocationAuthorisationType:(LocationAuthorisationType)locationAuthorisationType {
-    return (SMLocationAuthorisationType) ((NSNumber *)_locationAuthorisationTypeMapping[@(locationAuthorisationType)]).integerValue;
-}
-
-- (LocationAuthorisationType)locationAuthorisationTypeForSMLocationAuthorisationType:(SMLocationAuthorisationType)smLocationAuthorisationType {
-    return (LocationAuthorisationType) ((NSNumber *)[_locationAuthorisationTypeMapping allKeysForObject:@(smLocationAuthorisationType)].firstObject).integerValue;
+-(SMRemoteMessageDisplayType)smRemoteMessageDisplayTypeForRemoteMessageDisplayType:(RemoteMessageDisplayType)remoteMessageDisplayType {
+    return (SMRemoteMessageDisplayType) ((NSNumber *)_remoteMessageDisplayTypeEnumMapping[@(remoteMessageDisplayType)]).integerValue;
 }
 
 - (UIBackgroundFetchResult)uiBackgroundFetchResultForBackgroundFetchResult:(BackgroundFetchResult)backgroundFetchResult {

package/ios/RNSelligent.m

@@ -3,7 +3,6 @@
 #import "SMNSNotification.h"
 #import "SMManager+DataTransaction.h"
 #import "SMManagerSetting+ClientSettings.h"
-#import "SMManager+Location.h"
 #import "SMManager+Log.h"
 #import "SMManager+SMEvent.h"
 #import "SMManager+RemoteNotification.h"
@@ -25,6 +24,7 @@ static NSString * const BROADCAST_BUTTON_CLICKED = @"ButtonClicked";
 static NSString * const BROADCAST_RECEIVED_IN_APP_MSG = @"ReceivedInAppMessage";
 static NSString * const BROADCAST_WILL_DISPLAY_NOTIFICATION = @"WillDisplayNotification";
 static NSString * const BROADCAST_WILL_DISMISS_NOTIFICATION = @"WillDismissNotification";
+static NSString * const BROADCAST_RECEIVED_DEVICE_ID = @"ReceivedDeviceId";
 static NSString * const BROADCAST_RECEIVED_REMOTENOTIFICATION = @"ReceivedRemoteNotification";
 static NSString * const FETCHED_REMOTE_NOTIFICATION = @"FetchedRemoteNotification";
 
@@ -107,7 +107,7 @@ RCT_EXPORT_MODULE(RNSelligent)
     [[SMManager sharedInstance] willPresentNotification:notification withCompletionHandler:completionHandler];
 }
 
-+ (void)didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler {
++ (void)didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(UNNotificationContentExtensionResponseOption options))completionHandler {
     [[SMManager sharedInstance] didReceiveNotificationResponse:response withCompletionHandler:completionHandler];
 }
 
@@ -141,7 +141,8 @@ RCT_EXPORT_METHOD(getInAppMessages:(RCTResponseSenderBlock)callback) {
             @"creationDate" : @([[inAppMessage creationDate] timeIntervalSince1970]),
             @"expirationDate" : [inAppMessage expirationDate] ? @([[inAppMessage expirationDate] timeIntervalSince1970]) : [NSNull null],
             @"hasBeenSeen" : @([inAppMessage isViewed]),
-            @"buttons" : mappedLinks
+            @"buttons" : mappedLinks,
+            @"type" : @([inAppMessage iamType])
         }];
     }
     callback(@[mappedMessages ?: [NSNull null], [NSNull null]]);
@@ -187,22 +188,6 @@ RCT_EXPORT_METHOD(applyLogLevel:(NSArray<NSNumber *> *)logLevels) {
     [[SMManager sharedInstance] applyLogLevel:(SMLogLevel) requestedBitShiftedLogLevel];
 }
 
-RCT_EXPORT_METHOD(currentAuthorisationStatus:(RCTResponseSenderBlock)callback) {
-    SMLocationAuthorisationStatus smLocationAuthStatus = [[SMManager sharedInstance] currentAuthorisationStatus];
-    LocationAuthorisationStatus status = [[EnumMapper sharedEnumMapper] locationAuthorisationStatusForSMLocationAuthorisationStatus:smLocationAuthStatus];
-    callback(@[@(status), [NSNull null]]);
-}
-
-RCT_EXPORT_METHOD(requestLocationAuthorisation:(NSInteger)authorisationType) {
-    SMLocationAuthorisationType smAuthType = [[EnumMapper sharedEnumMapper] smLocationAuthorisationTypeForLocationAuthorisationType:authorisationType];
-    [[SMManager sharedInstance] requestLocationAuthorisation:smAuthType];
-}
-
-RCT_EXPORT_METHOD(isGeolocationEnabled:(RCTResponseSenderBlock)callback) {
-    BOOL enabled = [[SMManager sharedInstance] isGeoLocationEnabled];
-    callback(@[@(enabled), [NSNull null]]);
-}
-
 RCT_EXPORT_METHOD(sendEvent:(NSDictionary *)data successCallback:(RCTResponseSenderBlock)successCallback errorCallback:(RCTResponseSenderBlock)errorCallback) {
     Event *event = [Event fromDictionary:data];
     SMEvent *smEvent = [event smEventWithBlockSuccess:^(SMSuccess *success) {
@@ -213,18 +198,15 @@ RCT_EXPORT_METHOD(sendEvent:(NSDictionary *)data successCallback:(RCTResponseSen
     [[SMManager sharedInstance] sendSMEvent:smEvent];
 }
 
-RCT_EXPORT_METHOD(enableGeolocation:(BOOL)enable) {
-    if (enable) {
-        [[SMManager sharedInstance] enableGeoLocation];
-    } else {
-        [[SMManager sharedInstance] disableGeoLocation];
-    }
-}
-
 RCT_EXPORT_METHOD(forceRemoteNotificationBackgroundFetchResult:(nonnull NSNumber *)remoteNotificationBackgroundFetchResult) {
     self.requestedForcedRemoteNotificationBackgroundFetchResult = @([[EnumMapper sharedEnumMapper] uiBackgroundFetchResultForBackgroundFetchResult:remoteNotificationBackgroundFetchResult.integerValue]);
 }
 
+RCT_EXPORT_METHOD(getDeviceId:(RCTResponseSenderBlock)callback) {
+    NSString *deviceId = [[SMManager sharedInstance] deviceID];
+    callback(@[deviceId, [NSNull null]]);
+}
+
 RCT_EXPORT_METHOD(enableNotifications:(BOOL)enable) {
     if (enable) {
         [[SMManager sharedInstance] registerForRemoteNotification];
@@ -233,6 +215,12 @@ RCT_EXPORT_METHOD(enableNotifications:(BOOL)enable) {
     }
 }
 
+RCT_EXPORT_METHOD(registerForProvisionalRemoteNotification) {
+    if (@available(iOS 12.0, *)) {
+        [[SMManager sharedInstance] registerForProvisionalRemoteNotification];
+    }
+}
+
 RCT_EXPORT_METHOD(displayLastReceivedRemotePushNotification) {
     [[SMManager sharedInstance] displayLastReceivedRemotePushNotification];
 }
@@ -258,6 +246,7 @@ RCT_EXPORT_METHOD(subscribeToEvents) {
     [self _addOrReplaceObserverForSelector:@selector(_handleButtonClicked:) forName:kSMNotification_Event_ButtonClicked];
     [self _addOrReplaceObserverForSelector:@selector(_handleWillDisplayNotification:) forName:kSMNotification_Event_WillDisplayNotification];
     [self _addOrReplaceObserverForSelector:@selector(_handleWillDismissNotification:) forName:kSMNotification_Event_WillDismissNotification];
+    [self _addOrReplaceObserverForSelector:@selector(_handleReceivedDeviceId:) forName:kSMNotification_Data_DeviceId];
     [self _addOrReplaceObserverForSelector:@selector(_handleDidReceiveRemoteNotification:) forName:kSMNotification_Event_DidReceiveRemoteNotification];
 }
 
@@ -307,6 +296,15 @@ RCT_EXPORT_METHOD(subscribeToEvents) {
     [self _sendBroadcastEventResultWithData:nil andType:BROADCAST_WILL_DISMISS_NOTIFICATION];
 }
 
+- (void)_handleReceivedDeviceId:(NSNotification*)notification {
+    NSDictionary *dict = [notification userInfo];
+    NSString *deviceId = [dict objectForKey:kSMNotification_Data_DeviceId];
+    NSDictionary *data = @{
+        @"deviceId": deviceId
+    };
+    [self _sendBroadcastEventResultWithData:data andType:BROADCAST_RECEIVED_DEVICE_ID];
+}
+
 - (void)_sendBroadcastEventResultWithData:(NSDictionary *)data andType:(NSString *)type {
     [self sendEventWithName:type body:@{@"data": data ?: [NSNull null], @"broadcastEventType": type}];
 }

package/ios/RemoteMessageDisplayType.h

@@ -0,0 +1,5 @@
+typedef enum RemoteMessageDisplayType : NSInteger {
+    rmdtAutomatic = 20,
+    rmdtNone = 21,
+    rmdtNotification = 22,
+} RemoteMessageDisplayType;

package/ios/SMManagerSetting+ClientSettings.m

@@ -25,6 +25,11 @@
         }
     }
     
+    NSNumber *shouldAddInAppMessageFromPushToInAppMessageList = clientSettings.shouldAddInAppMessageFromPushToInAppMessageList;
+    if(shouldAddInAppMessageFromPushToInAppMessageList) {
+        settings.shouldAddInAppMessageFromPushToInAppMessageList = shouldAddInAppMessageFromPushToInAppMessageList.boolValue;
+    }
+    
     NSNumber *shouldClearBadgeAsNumber = clientSettings.shouldClearBadge;
     if(shouldClearBadgeAsNumber) {
         settings.shouldClearBadge = shouldClearBadgeAsNumber.boolValue;
@@ -35,14 +40,15 @@
         settings.shouldDisplayRemoteNotification = shouldDisplayRemoteNotificationAsNumber.boolValue;
     }
     
-    if(clientSettings.configureLocationServices.boolValue) {
-        [settings configureLocationService];
-    }
-    
     NSNumber *clearCacheIntervalValueAsNumber = clientSettings.clearCacheIntervalValue;
     if(clearCacheIntervalValueAsNumber) {
         settings.clearCacheIntervalValue = [[EnumMapper sharedEnumMapper] smClearCacheForClearCacheInterval:clearCacheIntervalValueAsNumber.integerValue]; //((SMClearCache) );
     }
+    
+    NSNumber *remoteMessageDisplayType = clientSettings.remoteMessageDisplayType;
+    if(remoteMessageDisplayType) {
+        settings.remoteMessageDisplayType = [[EnumMapper sharedEnumMapper] smRemoteMessageDisplayTypeForRemoteMessageDisplayType:remoteMessageDisplayType.integerValue];
+    }
 }
 
 + (SMManagerSettingIAM *)_iamManagerSettingsFor:(ClientSettings *)clientSettings {

package/ios/SelligentReactNative.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		60A5C5B5261747570002B0A2 /* libSelligentMobile2.5.2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 60A5C5B4261747570002B0A2 /* libSelligentMobile2.5.2.a */; };
+		60698C70276254340003E3AD /* libSelligentMobile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 60698C6F276254340003E3AD /* libSelligentMobile.a */; };
 		B3E7B58A1CC2AC0600A0062D /* RNSelligent.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RNSelligent.m */; };
 		E5002D3320F5002A00F68509 /* ClientSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = E5002D3120F5002A00F68509 /* ClientSettings.m */; };
 		E5002D3620F5004200F68509 /* SMManagerSetting+ClientSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = E5002D3520F5004200F68509 /* SMManagerSetting+ClientSettings.m */; };
@@ -32,7 +32,7 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libRNSelligent.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNSelligent.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		60A5C5B4261747570002B0A2 /* libSelligentMobile2.5.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSelligentMobile2.5.2.a; sourceTree = "<group>"; };
+		60698C6F276254340003E3AD /* libSelligentMobile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSelligentMobile.a; sourceTree = "<group>"; };
 		B3E7B5881CC2AC0600A0062D /* RNSelligent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNSelligent.h; sourceTree = "<group>"; };
 		B3E7B5891CC2AC0600A0062D /* RNSelligent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNSelligent.m; sourceTree = "<group>"; };
 		E5002D3120F5002A00F68509 /* ClientSettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientSettings.m; sourceTree = "<group>"; };
@@ -48,8 +48,6 @@
 		E5002D3F20F5015A00F68509 /* EnumMapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EnumMapper.h; sourceTree = "<group>"; };
 		E5002D4020F5015A00F68509 /* EnumMapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EnumMapper.m; sourceTree = "<group>"; };
 		E5002D4220F5018200F68509 /* InAppMessageRefreshType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InAppMessageRefreshType.h; sourceTree = "<group>"; };
-		E5002D4320F5019500F68509 /* LocationAuthorisationStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocationAuthorisationStatus.h; sourceTree = "<group>"; };
-		E5002D4420F5019500F68509 /* LocationAuthorisationType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocationAuthorisationType.h; sourceTree = "<group>"; };
 		E5002D4520F501A400F68509 /* ClearCacheInterval.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ClearCacheInterval.h; sourceTree = "<group>"; };
 		E5002D4620F501A400F68509 /* NotificationButtonType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotificationButtonType.h; sourceTree = "<group>"; };
 		E5002D4720F501B000F68509 /* BackgroundFetchResult.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BackgroundFetchResult.h; sourceTree = "<group>"; };
@@ -99,9 +97,7 @@
 		E58A8CD320F32CB4005EA433 /* SMContentAlignment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMContentAlignment.h; sourceTree = "<group>"; };
 		E58A8CD420F32CB4005EA433 /* SMHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMHelper.h; sourceTree = "<group>"; };
 		E58A8CD520F32CB4005EA433 /* SMInAppContentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMInAppContentViewController.h; sourceTree = "<group>"; };
-		E58A8CD620F32CB4005EA433 /* SMLocationAuthorisationType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMLocationAuthorisationType.h; sourceTree = "<group>"; };
 		E58A8CD720F32CB4005EA433 /* SMInAppContentImageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMInAppContentImageViewController.h; sourceTree = "<group>"; };
-		E58A8CD820F32CB4005EA433 /* SMManager+Location.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SMManager+Location.h"; sourceTree = "<group>"; };
 		E58A8CD920F32CB4005EA433 /* SMEventUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMEventUser.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -110,7 +106,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				60A5C5B5261747570002B0A2 /* libSelligentMobile2.5.2.a in Frameworks */,
+				60698C70276254340003E3AD /* libSelligentMobile.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -128,7 +124,7 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
-				60A5C5B4261747570002B0A2 /* libSelligentMobile2.5.2.a */,
+				60698C6F276254340003E3AD /* libSelligentMobile.a */,
 				E58A8CAC20F32CB4005EA433 /* include */,
 				E5002D3720F500C200F68509 /* SelligentLogger.h */,
 				E5002D3820F500C200F68509 /* SelligentLogger.m */,
@@ -149,8 +145,6 @@
 				E5002D4720F501B000F68509 /* BackgroundFetchResult.h */,
 				E5002D4520F501A400F68509 /* ClearCacheInterval.h */,
 				E5002D4620F501A400F68509 /* NotificationButtonType.h */,
-				E5002D4320F5019500F68509 /* LocationAuthorisationStatus.h */,
-				E5002D4420F5019500F68509 /* LocationAuthorisationType.h */,
 				E5002D4220F5018200F68509 /* InAppMessageRefreshType.h */,
 				E51D94E820FF88DB00069B07 /* EventType.h */,
 				E5002D3F20F5015A00F68509 /* EnumMapper.h */,
@@ -203,9 +197,7 @@
 				E58A8CD320F32CB4005EA433 /* SMContentAlignment.h */,
 				E58A8CD420F32CB4005EA433 /* SMHelper.h */,
 				E58A8CD520F32CB4005EA433 /* SMInAppContentViewController.h */,
-				E58A8CD620F32CB4005EA433 /* SMLocationAuthorisationType.h */,
 				E58A8CD720F32CB4005EA433 /* SMInAppContentImageViewController.h */,
-				E58A8CD820F32CB4005EA433 /* SMManager+Location.h */,
 				E58A8CD920F32CB4005EA433 /* SMEventUser.h */,
 			);
 			path = include;

package/ios/include/SMBaseMessage.h

@@ -10,43 +10,39 @@
 
 /*!
  *  @discussion This is the Base class for message (push notif, in app message and in app content)
- *  #SMBaseMessage :#
  */
 @interface SMBaseMessage : NSObject
 
 /*!
  *  NSString instance providing the id of the message
  */
-@property (nonatomic) NSString *idMessage;
+@property (readonly, nonatomic) NSString *_Nullable idMessage;
 
 /*!
  *  NSDate instance providing the creation date of the message
- *  @deprecated Deprecated use receptionDate  instead
+ *
+ *  @warning Deprecated - use receptionDate  instead
  */
-@property (nonatomic) NSDate *dateCreation __deprecated __deprecated_msg("Use receptionDate instead");
+@property (readonly, nonatomic) NSDate *_Nullable dateCreation __deprecated __deprecated_msg("Use receptionDate instead");
 
 /*!
  *  NSDate instance providing the reception date on sdk side of the message
 */
-@property (nonatomic) NSDate *receptionDate;
+@property (readonly, nonatomic) NSDate *_Nullable receptionDate;
 
 /*!
  *  NSDate instance providing the expiration date of the message
  */
-@property (nonatomic) NSDate   *expirationDate;
+@property (readonly, nonatomic) NSDate *_Nullable expirationDate;
 
 /*!
  *  NSDate instance providing the creation date of the message
  */
-@property (nonatomic) NSDate   *creationDate;
+@property (readonly, nonatomic) NSDate *_Nullable creationDate;
 
 /*!
  *  bool instance infiorming if the message has already been displayed and viewed by user
  */
-@property (nonatomic) bool    isViewed;
+@property (readonly, nonatomic) bool isViewed;
 
-/*!
- *  bool instance infiorming if the message has  been deleted
- */
-@property (nonatomic) bool    isDeleted;
 @end

package/ios/include/SMBlock.h

@@ -12,10 +12,10 @@
  *  @typedef type of block that will be triggered when an event has been succesfully sent
  *  @param success a SMSuccess object
  */
-typedef void(^SMCompletionBlockSuccess)(SMSuccess *success);
+typedef void(^SMCompletionBlockSuccess)(SMSuccess *_Nullable success);
 
 /**
  *  @typedef type of block that will be triggered when an event has failed to be sent
  *  @param failure a SMFailure failure
  */
-typedef void(^SMCompletionBlockFailure)(SMFailure *failure);
+typedef void(^SMCompletionBlockFailure)(SMFailure *_Nullable failure);

package/ios/include/SMClearCache.h

@@ -6,10 +6,8 @@
 //  Copyright (c) 2015 Selligent. All rights reserved.
 //
 
-
 /**
  *  Enumeration used to define how often the SDK's cache should automaticaly clear itself
- *  #SMClearCache :#
  */
 typedef NS_ENUM(NSInteger, SMClearCache) {
     /**

package/ios/include/SMContentAlignment.h

@@ -7,7 +7,7 @@
 //
 
 /**
- *  #SMContentAlignment :#
+ *
  */
 typedef NS_ENUM(NSInteger, SMContentAlignment) {
     /*!
@@ -25,4 +25,3 @@ typedef NS_ENUM(NSInteger, SMContentAlignment) {
      */
     kSMAlignCenter
 };
-

package/ios/include/SMDeviceInfos.h

@@ -9,28 +9,30 @@
 #import <Foundation/Foundation.h>
 
 /*!
- * #SMDeviceInfos :#
  */
 @interface SMDeviceInfos : NSObject
 
 /*!
  *  Any External Id in your possession that you wish to transmit to the back-end
- *  @discussion NSString
+ *
+ *  @discussion NSString representing your external, custom identifier.
  *  By default, it is an empty string
  */
-@property (nonatomic) NSString *externalId;
+@property (nonatomic) NSString* _Nullable externalId;
 
 /*!
  *  Create a generic deviceinfos object
- *  @return a SMDeviceInfos object
+ *
+ *  @return An SMDeviceInfos object
  */
-+ (instancetype)defaultDeviceInfos;
++ (instancetype _Nullable ) defaultDeviceInfos;
 
 /*!
  *  Create a deviceinfos object with an external id property already set with the value provided
- *  @param externalId a string containing the id you want to provide to the back-end
- *  @return a SMDeviceInfos object
+ *
+ *  @param externalId An string containing the id you want to provide to the back-end
+ *  @return An SMDeviceInfos object
  */
-+ (instancetype)deviceInfosWithExternalId:(NSString*) externalId;
++ (instancetype _Nullable ) deviceInfosWithExternalId:(NSString*_Nullable) externalId;
 
 @end

package/ios/include/SMDisplayMode.h

@@ -6,9 +6,8 @@
 //  Copyright © 2016 Selligent. All rights reserved.
 //
 
-
 /*!
- *  #SMDisplayMode :#
+ *
  */
 typedef NS_ENUM(NSInteger, SMDisplayMode) {
     /*!

package/ios/include/SMEvent.h

@@ -11,15 +11,11 @@
 #import "SMFailure.h"
 #import "SMSuccess.h"
 
-
-
 /*!
- * @discussion This is the Base class for all type of events
- * #SMEvent :#
+ * This is the Base class for all type of events
  */
 @interface SMEvent : NSObject
 
-
 /*!
  *  Confirm if the current event should be cached or not
  *  @discussion If the event fail to be delivered to your backend, then by default, it is cached into an internal queue.
@@ -29,36 +25,44 @@
  */
 @property (nonatomic) BOOL shouldCache;
 
-
-
 /*!
  *  Create a generic event object that will be sent to platform
- *  @param dict a Dictionary containing any kind of custom datas that must be stored and managed by platform
- *  @return a SMEvent object
+ *
+ *  @param dict A Dictionary containing any kind of custom datas that must be stored and managed by platform
+ *  @return An SMEvent object
  */
-+ (instancetype _Nonnull)eventWithDictionary:(NSDictionary* _Nullable)dict;
++ (instancetype _Nonnull) eventWithDictionary:(NSDictionary* _Nullable)dict;
 
 /*!
  *  Allow to initialise a success block and/or a failure block that will be triggered after an event is sent to the platform
  *
- *  @param blockSuccess a SMCompletionBlockSuccess block that will be triggered if the send to the platform is successfull
- *  @param blockFailure a SMCompletionBlockFailure block that will be triggered if the send to the platform has failed
+ *  @param blockSuccess An SMCompletionBlockSuccess block that will be triggered if the send to the platform is successfull
+ *  @param blockFailure An SMCompletionBlockFailure block that will be triggered if the send to the platform has failed
  *  @discussion This method may be used as follow:
  *
  *  @code
  *  NSDictionary *dictMyCustomData = @{@"MyKey": @"MyValue"};
+ *
  *  SMEvent *event = [SMEvent eventWithDictionary:dictMyCustomData];
- *  [event applyBlockSuccess:^(SMSuccess *success) { 
- *  //  My code for success} 
- *  BlockFailure:^(SMFailure *failure) { 
+ *
+ *  [event applyBlockSuccess:^(SMSuccess *success) {
+ *
+ *  //  My code for success}
+ *
+ *  BlockFailure:^(SMFailure *failure) {
+ *
  *  //  My code for failure }];
+ *
  *  [[SMManager sharedInstance] sendSMEvent:event];
  *  @endcode
+ *  
  *  This method is optional. Use it only if you need it.
  *  @warning It is developer's responsability to make sure no strong retrain cycles are added to the completion-blocks.
  *  Make sure to read the following [Apple documentation.](https://developer.apple.com/library/ios/documentation/Cocoa/Conceptual/ProgrammingWithObjectiveC/WorkingwithBlocks/WorkingwithBlocks.html#//apple_ref/doc/uid/TP40011210-CH8-SW16)
+ *  @see SMCompletionBlockSuccess
+ *  @see SMCompletionBlockFailure
  */
-- (void)applyBlockSuccess:(SMCompletionBlockSuccess _Nullable)blockSuccess BlockFailure:(SMCompletionBlockFailure _Nullable)blockFailure;
+- (void) applyBlockSuccess:(SMCompletionBlockSuccess _Nullable)blockSuccess BlockFailure:(SMCompletionBlockFailure _Nullable)blockFailure;
 
 @end
 

package/ios/include/SMEventUser.h

@@ -9,7 +9,6 @@
 #import "SMEvent.h"
 
 /*!
- *  @inherits SMEvent
  *  @discussion Class representing all User-eventing
  *  Instances of this class should not be directly created.
  *  Please use children classes instead.

package/ios/include/SMEventUserLogin.h

@@ -9,38 +9,33 @@
 #import "SMEventUser.h"
 
 /*!
- * @class SMEventUserLogin
- * @inherits SMEventUser
- * @discussion user login event class
- * #SMEventUserLogin:#
+ * User login event class
  */
 @interface SMEventUserLogin : SMEventUser
 
-
 /*!
  *  Create a UserLogin event object that will be sent to selligent platform when user logged in
  *
- *  @param mail the e-mail of the user
- *  @return a SMEventUserLogin object
+ *  @param mail The e-mail of the user
+ *  @return An SMEventUserLogin object
  */
-+ (instancetype _Nonnull)eventWithEmail:(NSString*_Null_unspecified)mail;
++ (instancetype _Nonnull) eventWithEmail:(NSString*_Null_unspecified)mail;
 
 /*!
  *  Create a UserLogin event object that will be sent to selligent platform when user logged in
  *
- *  @param mail the e-mail of the user
- *  @param dict a Dictionary containing a string as data that must be stored and managed by platform
+ *  @param mail The e-mail of the user
+ *  @param dict A Dictionary containing a string as data that must be stored and managed by platform
  *  If email is not provided you can use in the dictionary an alternate key/value field to search for the user
- *     example: [SMEventUserLogin eventWithEmail @"" Dictionary: @{@"userID": @"1234"}];
- *  @return a SMEventUserLogin object
+ *  @return An SMEventUserLogin object
  */
-+ (instancetype _Nonnull)eventWithEmail:(NSString*_Null_unspecified)mail Dictionary:(NSDictionary<NSString*,NSString*>*_Nullable)dict;
++ (instancetype _Nonnull) eventWithEmail:(NSString*_Null_unspecified)mail Dictionary:(NSDictionary<NSString*,NSString*>*_Nullable)dict;
 
 /*!
  *  Create a UserLogin event object that will be sent to platform
- *  @param dict a Dictionary containing an alternate key/value field to search for the user
- *     example: [SMEventUserLogin eventWithDictionary: @{@"userID": @"1234"}];
- *  @return a SMEventUserLogin object
+ *
+ *  @param dict A Dictionary containing an alternate key/value field to search for the user
+ *  @return An SMEventUserLogin object
  */
 + (instancetype _Nonnull)eventWithDictionary:(NSDictionary* _Nullable)dict;