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

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -0,0 +1,25 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml:2:1-5:12
+INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml:2:1-5:12
+INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml:2:1-5:12
+	package
+		ADDED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml:3:11-34
+		INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml
+	xmlns:android
+		ADDED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml:2:11-69
+uses-sdk
+INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/ben/Documents/code/appfoundry/selligent/af-selligent-react-native-module-dev-env/node_modules/selligent-react-native/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -1,3 +1,8 @@
+import com.android.build.api.variant.BuildConfigField
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+
 buildscript {
     repositories {
         google()
@@ -5,20 +10,31 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.2.2'
     }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'maven'
+def buildTypeAttr = Attribute.of("com.android.build.api.attributes.BuildTypeAttr", String)
+
+dependencies.attributesSchema {
+    // registers this attribute to the attributes schema
+    attribute(buildTypeAttr)
+}
+
+configurations {
+    implementation {
+        attributes {
+            attribute(buildTypeAttr, "release")
+        }
+    }
+}
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 32
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 32
         ndkVersion = "21.4.7075529"
         versionCode 1
         versionName "1.0"
@@ -34,7 +50,7 @@ androidComponents {
         def selligentSettings = loadSelligentSettings(variant)
         if (selligentSettings != null) {
             try {
-                variant.addBuildConfigField("SELLIGENT_SETTINGS", "\"" + selligentSettings + "\"", "Selligent settings")
+                variant.buildConfigFields.put("SELLIGENT_SETTINGS", new BuildConfigField("String", "\"" + selligentSettings + "\"", "Selligent settings"))
             } catch (MissingMethodException ignored) {
                 throw new Exception("Selligent requires Android Gradle plugin version 4.2.0 or higher.")
             }
@@ -54,45 +70,26 @@ dependencies {
 
     implementation 'com.facebook.react:react-native:+'
     implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.plotprojects:plot-android:3.13.1'
+    implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.firebase:firebase-messaging:21.0.0'
-    implementation 'androidx.work:work-runtime:2.4.0'
+    implementation 'androidx.work:work-runtime:2.7.1'
     implementation 'androidx.concurrent:concurrent-futures:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
 }
 
-def configureReactNativePom(def pom) {
-    def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text)
-
-    pom.project {
-        name packageJson.title
-        artifactId packageJson.name
-        version = packageJson.version
-        group = "com.selligent"
-        description packageJson.description
-        url packageJson.repository.baseUrl
-
-        licenses {
-            license {
-                name packageJson.license
-                url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
-                distribution 'repo'
-            }
-        }
-    }
-}
-
 afterEvaluate { project ->
 
     task androidJavadoc(type: Javadoc) {
         source = android.sourceSets.main.java.srcDirs
         classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName('compile').asList())
+        project.getConfigurations().getByName('implementation').setCanBeResolved(true)
+        classpath += files(project.getConfigurations().getByName('implementation').asList())
         include '**/*.java'
     }
 
     task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        classifier = 'javadoc'
+        archiveClassifier = 'javadoc'
         from androidJavadoc.destinationDir
     }
 
@@ -109,17 +106,12 @@ afterEvaluate { project ->
         }
     }
 
-    artifacts {
-        archives androidSourcesJar
-        archives androidJavadocJar
-    }
-
-    task installArchives(type: Upload) {
-        configuration = configurations.archives
-        repositories.mavenDeployer {
-            repository url: "file://${projectDir}/../android/maven"
-
-            configureReactNativePom pom
+    publishing {
+        publications {
+            maven(MavenPublication) {
+                artifact androidSourcesJar
+                artifact androidJavadocJar
+            }
         }
     }
 }

package/android/src/main/java/com/selligent/RNSelligent.java

@@ -249,6 +249,21 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
         SMManager.DEBUG = enable;
     }
 
+    @ReactMethod
+    public void enableGeolocation(Boolean enable) {
+        if (enable) {
+            smManager.enableGeolocation();
+        } else {
+            smManager.disableGeolocation();
+        }
+    }
+
+    @ReactMethod
+    public void isGeolocationEnabled(Callback successCallback) {
+        final Boolean isGeolocationEnabled = smManager.isGeolocationEnabled();
+        successCallback.invoke(isGeolocationEnabled);
+    }
+
     @ReactMethod
     public void sendEvent(ReadableMap eventMap, final Callback successCallback, final Callback errorCallback) {
         final Event event = Event.fromHashMap(eventMap.toHashMap());

package/android/src/main/java/com/selligent/SMSettingsFactory.java

@@ -10,10 +10,14 @@ class SMSettingsFactory {
         smSettings.ClientId = settings.getClientId();
         smSettings.PrivateKey = settings.getPrivateKey();
         smSettings.GoogleApplicationId = settings.getGoogleApplicationId();
+        smSettings.ConfigureGeolocation = settings.getConfigureLocationServices();
         smSettings.AddInAppMessageFromPushToInAppMessageList = settings.getAddInAppMessageFromPushToInAppMessageList();
         smSettings.DoNotFetchTheToken = settings.getDoNotFetchTheToken();
         smSettings.DoNotListenToThePush = settings.getDoNotListenToThePush();
         smSettings.LoadCacheAsynchronously = settings.getLoadCacheAsynchronously();
+        smSettings.NotificationChannelId = settings.getNotificationChannelId();
+        smSettings.NotificationChannelName = settings.getNotificationChannelName();
+        smSettings.NotificationChannelDescription = settings.getNotificationChannelDescription();
 
         final ClearCacheIntervalValue clearCacheIntervalValue = settings.getClearCacheIntervalValue();
         if (clearCacheIntervalValue != null) {

package/android/src/main/java/com/selligent/Settings.java

@@ -17,9 +17,13 @@ class Settings {
     private Boolean doNotFetchTheToken = false;
     private Boolean doNotListenToThePush = false;
     private Boolean loadCacheAsynchronously = false;
+    private Boolean configureLocationServices = false;
     private ClearCacheIntervalValue clearCacheIntervalValue;
     private InAppMessageRefreshType inAppMessageRefreshType;
     private RemoteMessageDisplayType remoteMessageDisplayType;
+    private String notificationChannelId = "SMChannel001";
+    private String notificationChannelName = "SMDefaultChannel";
+    private String notificationChannelDescription = "";
 
     private Settings() { }
 
@@ -55,6 +59,10 @@ class Settings {
         return notificationIconColor;
     }
 
+    public Boolean getConfigureLocationServices() {
+        return configureLocationServices;
+    }
+
     public Boolean getDoNotListenToThePush() { return doNotListenToThePush; }
 
     public Boolean getAddInAppMessageFromPushToInAppMessageList() { return addInAppMessageFromPushToInAppMessageList; }
@@ -75,6 +83,18 @@ class Settings {
         return remoteMessageDisplayType;
     }
 
+    public String getNotificationChannelId() {
+        return notificationChannelId;
+    }
+
+    public String getNotificationChannelName() {
+        return notificationChannelName;
+    }
+
+    public String getNotificationChannelDescription() {
+        return notificationChannelDescription;
+    }
+
     public static Settings fromHashMap(HashMap<String, Object> settingsHashMap) {
         final Settings settings = new Settings();
 
@@ -84,6 +104,10 @@ class Settings {
         if (settingsHashMap.containsKey("googleApplicationId")) {
             settings.googleApplicationId = (String) settingsHashMap.get("googleApplicationId");
         }
+        if (settingsHashMap.containsKey("configureLocationServices")) {
+            settings.configureLocationServices = (Boolean) settingsHashMap.get("configureLocationServices");
+
+        }
         settings.activityName = (String) settingsHashMap.get("fullyQualifiedNotificationActivityClassName");
 
         if (settingsHashMap.containsKey("notificationSmallIcon")) {
@@ -113,6 +137,15 @@ class Settings {
         if (settingsHashMap.containsKey("loadCacheAsynchronously")) {
             settings.loadCacheAsynchronously = (Boolean) settingsHashMap.get("loadCacheAsynchronously");
         }
+        if (settingsHashMap.containsKey("notificationChannelId")) {
+            settings.notificationChannelId = (String) settingsHashMap.get("notificationChannelId");
+        }
+        if (settingsHashMap.containsKey("notificationChannelName")) {
+            settings.notificationChannelName = (String) settingsHashMap.get("notificationChannelName");
+        }
+        if (settingsHashMap.containsKey("notificationChannelDescription")) {
+            settings.notificationChannelDescription = (String) settingsHashMap.get("notificationChannelDescription");
+        }
 
         final Double clearCacheIndex = (Double) settingsHashMap.get("clearCacheIntervalValue");
         if (clearCacheIndex != null) {

package/constants.d.ts

@@ -53,6 +53,18 @@ export namespace iOSBackgroundFetchResult {
   const FAILED = 62;
 }
 
+export namespace iOSLocationAuthorisationStatus {
+  const UNKNOWN = 70;
+  const REFUSED = 71;
+  const GRANTED_IN_USE = 72;
+  const GRANTED_ALWAYS = 73;
+}
+
+export namespace iOSLocationAuthorisationType {
+  const IN_USE = 80;
+  const ALWAYS = 81;
+}
+
 export namespace EventType {
   const USER_REGISTER = 90;
   const USER_UNREGISTER = 91;

package/constants.js

@@ -102,6 +102,30 @@ var SelligentConstants = {
 		/** Background fetch failed */
 		FAILED: 62
 	},
+	/**
+	 * @description
+	 * Description of the possible status of use of location services on a device.
+	 */
+	 iOSLocationAuthorisationStatus: {
+		/** Status of use of location services is unknown */
+		UNKNOWN: 70,
+		/** Use of location services is refused */
+		REFUSED: 71,
+		/** Use of location services is granted when in use */
+		GRANTED_IN_USE: 72,
+		/** Use of location services is always granted */
+		GRANTED_ALWAYS: 73
+	},
+	/**
+	 * @description
+	 * Defines the level of request for the authorisation of usage of location services on a device.
+	 */
+	iOSLocationAuthorisationType: {
+		/** Request authorisation when in location services are in use */
+		IN_USE: 80,
+		/** Always request the authorisation of the location services */
+		ALWAYS: 81
+	},
 	/**
 	 * @description
 	 * Defines the type of an event.

package/index.d.ts

@@ -11,6 +11,12 @@ export function executeButtonAction(
   buttonId: string,
   messageId: string
 ): void;
+export function enableGeolocation(
+  successCallback: Function,
+  errorCallback: Function,
+  enabled: boolean
+): void;
+export function isGeolocationEnabled(successCallback: Function): void;
 export function sendEvent(
   successCallback: Function,
   errorCallback: Function,

package/index.js

@@ -98,6 +98,38 @@ export default Object.assign(
 			return
 		},
 
+		// Location
+
+		/**
+		 * Enable/disable geolocation.
+		 *  
+		 * @param {function} successCallback Callback function on success.
+		 * @param {function} errorCallback Callback function on error.
+		 * @param {boolean} enabled Boolean to enable or disable geolocation.
+		 */
+		 enableGeolocation: function (successCallback, errorCallback, enabled) {
+			// check if required options are valid
+			if (!SelligentHelpers.typeMatches(enabled, 'boolean')) {
+				errorCallback(SelligentHelpers.wrongArgumentError('Expected a boolean.'))
+				return
+			}
+
+			// continue if options are valid
+			successCallback(SelligentHelpers.SUCCESS)
+			RNSelligent.enableGeolocation(enabled)
+			return
+		},
+
+		/**
+		 * Check if geolocation is enabled or disabled.
+		 *  
+		 * @param {function} successCallback Callback function on success.
+		 */
+		isGeolocationEnabled: function (successCallback) {
+			RNSelligent.isGeolocationEnabled(successCallback)
+			return
+		},
+
 		// Event
 
 		/**

package/ios/ClientSettings.h

@@ -11,6 +11,7 @@
 @property (nonatomic, strong, readonly) NSNumber *shouldAddInAppMessageFromPushToInAppMessageList;
 @property (nonatomic, strong, readonly) NSNumber *shouldClearBadge;
 @property (nonatomic, strong, readonly) NSNumber *shouldDisplayRemoteNotification;
+@property (nonatomic, strong, readonly) NSNumber *configureLocationServices;
 @property (nonatomic, strong, readonly) NSNumber *clearCacheIntervalValue;
 @property (nonatomic, strong, readonly) NSNumber *remoteMessageDisplayType;
 @property (nonatomic, strong, readonly) InAppMessageSettings *inAppMessageSettings;

package/ios/ClientSettings.m

@@ -11,6 +11,7 @@
 @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;
@@ -28,6 +29,7 @@
     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];

package/ios/EnumMapper.h

@@ -2,6 +2,8 @@
 #import "LogLevel.h"
 #import "InAppMessageRefreshType.h"
 #import "RemoteMessageDisplayType.h"
+#import "LocationAuthorisationStatus.h"
+#import "LocationAuthorisationType.h"
 #import "ClearCacheInterval.h"
 #import "SMLog.h"
 #import "SMClearCache.h"

package/ios/EnumMapper.m

@@ -5,6 +5,8 @@
     NSDictionary *_clearCacheIntervalEnumMapping;
     NSDictionary *_inAppRefreshTypeEnumMapping;
     NSDictionary *_remoteMessageDisplayTypeEnumMapping;
+    NSDictionary *_locationAuthorisationStatusMapping;
+    NSDictionary *_locationAuthorisationTypeMapping;
     NSDictionary *_backgroundFetchResult;
     NSDictionary *_notificationButtonTypeMapping;
 }

package/ios/LocationAuthorisationStatus.h

@@ -0,0 +1,6 @@
+typedef enum LocationAuthorisationStatus : NSInteger {
+    ilasUnknown = 70,
+    ilasRefused = 71,
+    ilasGrantedInUse = 72,
+    ilasGrantedAlways = 73
+} LocationAuthorisationStatus;

package/ios/LocationAuthorisationType.h

@@ -0,0 +1,4 @@
+typedef enum LocationAuthorisationType : NSInteger {
+    ilatInUse = 80,
+    ilatAlways = 81
+} LocationAuthorisationType;

package/ios/RNSelligent.m

@@ -3,6 +3,7 @@
 #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"
@@ -188,6 +189,11 @@ RCT_EXPORT_METHOD(applyLogLevel:(NSArray<NSNumber *> *)logLevels) {
     [[SMManager sharedInstance] applyLogLevel:(SMLogLevel) requestedBitShiftedLogLevel];
 }
 
+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) {
@@ -198,6 +204,14 @@ 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]);
 }

package/ios/SMManagerSetting+ClientSettings.m

@@ -1,4 +1,5 @@
 #import "SMManagerSetting+ClientSettings.h"
+#import "SMManagerSetting+Location.h"
 #import "SMManagerSettingIAM.h"
 #import "ClientSettings.h"
 #import "EnumMapper.h"
@@ -34,6 +35,10 @@
     if(shouldClearBadgeAsNumber) {
         settings.shouldClearBadge = shouldClearBadgeAsNumber.boolValue;
     }
+
+     if(clientSettings.configureLocationServices.boolValue) {
+        [settings configureLocationService];
+    }
     
     NSNumber *shouldDisplayRemoteNotificationAsNumber = clientSettings.shouldDisplayRemoteNotification;
     if(shouldDisplayRemoteNotificationAsNumber) {

package/ios/include/SMEvent.h

@@ -34,7 +34,7 @@
 + (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
+ *  Allow to initialize a success block and/or a failure block that will be triggered after an event is sent to the platform
  *
  *  @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

package/ios/include/SMHelper.h

@@ -1,11 +1,14 @@
 //
-//  SMHelper.h
+//  SMHelper+Location.h
 //  MobileSDK
 //
-//  Created by Samy Ziat on 29/09/15.
-//  Copyright (c) 2015 Selligent. All rights reserved.
+//  Created by Marc Biosca on 6/29/21.
+//  Copyright © 2021 Selligent. All rights reserved.
 //
 
+#import "SMManager+Location.h"
+#import "SMManagerSetting+Location.h"
+
 #import "SMManagerHelper.h"
 
 #import "SMNSNotification.h"

package/ios/include/SMManager+InAppMessage.h

@@ -161,8 +161,8 @@
 - (void) removeViewController;
 
 /**
- *  Used to let the app display the inapp message linked to a remote notification
- *  @abstract this setting will allow you to  manage on app side the display of the inapp message linked to a push remote notification
+ *  Used to let the app display the in-app message linked to a remote notification
+ *  @abstract this setting will allow you to  manage on app side the display of the in-app message linked to a push remote notification
  *  In order to display it in your side the delegate object should implement [SMManagerInAppMessageDelegate displayInAppMessage:] method it will provide tha app with a SMInAppMessage object
  *  @param delegate  an object implementing SMManagerInAppMessageDelegate  methods
  *  @see SMManagerInAppMessageDelegate

package/ios/include/SMManager+Location.h

@@ -0,0 +1,41 @@
+//
+//  SMManager+Location.h
+//  MobileSDK
+//
+//  Created by Samy Ziat on 02/12/15.
+//  Copyright © 2015 Selligent. All rights reserved.
+//
+
+#import "SMManager.h"
+
+/*!
+ *  In order to use the location services features provided by the sdk you will mandatory need to use the lsdk library supporting the plotproject framework .
+ *  Otherwise calling the method in this SMManager category will have no effect and no ios api related to geofencing will be called (as this is all done by the plot project framework)
+ */
+@interface SMManager (Location)
+
+/**
+ *  Enable geolocation services
+ *
+ *  @discussion This optional call will enable geolocation services at sdk level. it is independent of iOS location authorisation
+ *  If you use plotproject for geolocation it will be mandatory to call it if you have set enableOnFirstRun to false in the plotconfig.json
+ *  Call this API according to your application's need.
+ */
+- (void) enableGeoLocation;
+
+/**
+ *  Disable geolocation services
+ *
+ *  @discussion This optional call will disable geolocation services at sdk level. it is independent of iOS location authorisation
+ *  Call this API according to your application's need.
+ */
+- (void) disableGeoLocation;
+
+/**
+ *  Check the geolocation services status
+ *
+ *  @discussion This optional call will inform you if geolocation services at sdk level are enabled. it is independent of iOS location authorisation
+ */
+- (BOOL) isGeoLocationEnabled;
+
+@end

package/ios/include/SMManager+UserNotification.h

@@ -103,9 +103,9 @@
  *  Mandatory method which allows sdk initialisation when building against iOS 10+ and using Notification Extensions .
  *  To be included in didReceiveNotification: when implementing Notification content extension and/or in didReceiveNotificationRequest:withContentHandler: when implementing Notification service extension
  *
- *  @param setting  mandatory SMManagerSetting instance to start-up the library - this setting mus tbe initialised with only url, clienID and privateKet provided by selligent
+ *  @param setting  mandatory SMManagerSetting instance to start-up the library - this setting mus tbe initialized with only url, clienID and privateKet provided by selligent
  *  @see SMManagerSetting
- *  @discussion This method is mandatory in order to start / initialise the library and should be called in in didReceiveNotification: when implementing Notification content extension and/or in didReceiveNotificationRequest:withContentHandler: when implementing Notification service extension
+ *  @discussion This method is mandatory in order to start / initialize the library and should be called in in didReceiveNotification: when implementing Notification content extension and/or in didReceiveNotificationRequest:withContentHandler: when implementing Notification service extension
  *  @see SMManagerSetting
  */
 - (void) startExtensionWithSetting:(SMManagerSetting*_Nonnull)setting;
@@ -120,7 +120,20 @@
  *
  *  @param notification A UNNotification that contains information about the notification.
  */
-- (void) didReceiveNotification:(UNNotification*_Nonnull)notification;
+- (void) didReceiveNotification:(UNNotification*_Nonnull)notification __deprecated_msg("Method deprecated. Use `didReceiveNotification:withContext:`");
+
+/*!
+ *  Optional API, when building against iOS 10+ and using a Notification Content Extension target, to be included in NotificationViewController didReceiveNotification:
+ *  Handle the push action buttons that may be present in the selligent notification payload
+ *
+ *  This allows the SDK to display the action buttons in the push notification outside of the app.
+ *
+ *  The category that must be added to Info.plist of the Notification Content Extension target is mandatory and must be SELLIGENT_BUTTON.
+ *
+ *  @param notification A UNNotification that contains information about the notification.
+ *  @param context A NSExtensionContext that contains the context information of the extension.
+ */
+- (void) didReceiveNotification:(UNNotification*_Nonnull)notification withContext:(NSExtensionContext*_Nullable)context;
 
 /*!
  *  Optional API, when building against iOS 10+ and using a Notification Service Extension target, to be included in NotificationService didReceiveNotificationRequest:withContentHandler:

package/ios/include/SMManager.h

@@ -46,7 +46,7 @@
  *  @param launchOptions NSDictionary instance indicating the reason the app was launched (if any). This dictionary is provided by application:didFinishLaunchingWithOptions
  *  @param setting  mandatory SMManagerSetting instance to start-up the library
  *  @see SMManagerSetting
- *  @discussion This method is mandatory in order to start / initialise the library and should be called in application:didFinishLaunchingWithOptions:
+ *  @discussion This method is mandatory in order to start / initialize the library and should be called in application:didFinishLaunchingWithOptions:
  */
 - (void) startWithLaunchOptions:(NSDictionary* _Nullable)launchOptions Setting:(SMManagerSetting* _Null_unspecified)setting;
 

package/ios/include/SMManagerInAppMessageDelegate.h

@@ -10,13 +10,13 @@
 #import "SMInAppMessage.h"
 
 /**
- *  This protocol will help you intercept the inapp messages and allow you to display them your own way or store them somewhere to be shown later.
+ *  This protocol will help you intercept the in-app messages and allow you to display them your own way or store them somewhere to be shown later.
  */
 @protocol SMManagerInAppMessageDelegate <NSObject>
 @optional
 
 /*!
- * @abstract Invoked when an inapp message linked to a remote notification is received by sdk.
+ * @abstract Invoked when an in-app message linked to a remote notification is received by sdk.
  * @param inAppMessage The inAppMessage object containing all necessary datas for you to display content of the message
  */
 - (void) displayInAppMessage:(SMInAppMessage*_Nonnull)inAppMessage;