@selligent-marketing-cloud/selligent-react-native 3.2.6 → 3.3.0

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

@@ -34,28 +34,45 @@ import com.selligent.sdk.SMCallback;
 import com.selligent.sdk.SMEvent;
 import com.selligent.sdk.SMForegroundGcmBroadcastReceiver;
 import com.selligent.sdk.SMInAppMessage;
-import com.selligent.sdk.SMInAppMessageReturn;
 import com.selligent.sdk.SMInAppRefreshType;
 import com.selligent.sdk.SMManager;
 import com.selligent.sdk.SMNotificationButton;
 import com.selligent.sdk.SMNotificationMessage;
+import com.selligent.sdk.SMObserverManager;
 import com.selligent.sdk.SMRemoteMessageDisplayType;
 import com.selligent.sdk.SMSettings;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 
 public class RNSelligent extends ReactContextBaseJavaModule implements LifecycleEventListener, ActivityEventListener {
 
+    private static final String RN_SELLIGENT_NAME = "RNSelligent";
     private final ReactApplicationContext reactContext;
     private final SMManager smManager;
-    private EventReceiver eventReceiver;
-    private SMForegroundGcmBroadcastReceiver receiver;
+    EventReceiver eventReceiver;
+    SMForegroundGcmBroadcastReceiver receiver;
     private static SMInAppRefreshType inAppMessageRefreshType;
 
     public static final String REACT_CLASS = "SelligentReactNative"; // for logging purposes
 
-    private boolean areObserverStarted = false;
+    boolean areObserverStarted = false;
+
+    //region getter
+    static SMManager getSMManager()
+    {
+        return SMManager.getInstance();
+    }
+
+    static String getSelligentSettings()
+    {
+        return BuildConfig.SELLIGENT_SETTINGS;
+    }
+
+    static Class<? extends Activity> getActivityClass(String notificationActivityName) throws Exception
+    {
+        return (Class<? extends Activity>) Class.forName(notificationActivityName);
+    }
+    //endregion
 
 
     public RNSelligent(ReactApplicationContext reactContext) {
@@ -63,28 +80,28 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
         this.reactContext = reactContext;
         reactContext.addLifecycleEventListener(this);
         reactContext.addActivityEventListener(this);
-        this.smManager = SMManager.getInstance();
+        this.smManager = getSMManager();
     }
 
     @Override
     public String getName() {
-        return "RNSelligent";
+        return RN_SELLIGENT_NAME;
     }
 
     public static void configure(Application application) {
         try {
             final HashMap<String, Object> settingsHashMap = new Gson().fromJson(
-                    BuildConfig.SELLIGENT_SETTINGS, new TypeToken<HashMap<String, Object>>() {}.getType()
+                    getSelligentSettings(), new TypeToken<HashMap<String, Object>>() {}.getType()
             );
             final Settings settings = Settings.fromHashMap(settingsHashMap);
             final SMSettings smSettings = SMSettingsFactory.getSMSettings(settings);
             final String notificationActivityName = settings.getActivityName();
 
-            SMManager.NOTIFICATION_ACTIVITY = (Class<? extends Activity>) Class.forName(notificationActivityName);
+            SMManager.NOTIFICATION_ACTIVITY = getActivityClass(notificationActivityName);
             inAppMessageRefreshType = settings.getInAppMessageRefreshType().getSmInAppRefreshType();
 
-            final SMManager smManager = SMManager.getInstance();
-            SMManager.DEBUG = BuildConfig.BUILD_TYPE.equals("debug");
+            final SMManager smManager = getSMManager();
+            SMManager.DEBUG = BuildConfig.BUILD_TYPE.equals("debug") || settings.getEnableAndroidLogging();
             smManager.start(smSettings, application);
 
             final Resources resources = application.getResources();
@@ -108,12 +125,12 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
                     final int color = Color.parseColor(settings.getNotificationIconColor());
                     smManager.setNotificationIconColor(color);
                 } catch (IllegalArgumentException e) {
-                    Log.e("RNSelligent", "notificationIconColor must be a color hex string.");
+                    Log.e(RN_SELLIGENT_NAME, "notificationIconColor must be a color hex string.");
                 }
             }
 
-        } catch (ClassNotFoundException e) {
-            Log.e("RNSelligent", "SMManager start failed: an error occurred while setting the NotificationActivity", e);
+        } catch (Exception e) {
+            Log.e(RN_SELLIGENT_NAME, "SMManager start failed: an error occurred while setting the NotificationActivity", e);
         }
     }
 
@@ -127,17 +144,18 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
 
     @ReactMethod
     public void enableInAppMessages(ReadableMap enabled) {
-        final ReadableType enabledType = enabled.getType("enabled");
+        final String enabledProperty = "enabled";
+        final ReadableType enabledType = enabled.getType(enabledProperty);
 
         if (enabledType == ReadableType.Boolean) {
-            enableInAppMessages(enabled.getBoolean("enabled"));
+            enableInAppMessages(enabled.getBoolean(enabledProperty));
         } 
         else if (enabledType == ReadableType.Number) {
-            enableInAppMessages(enabled.getInt("enabled"));
+            enableInAppMessages(enabled.getInt(enabledProperty));
         }
     }
 
-    private void enableInAppMessages(Boolean enable) {
+    private void enableInAppMessages(boolean enable) {
         if (enable) {
             smManager.enableInAppMessages(inAppMessageRefreshType);
         } else {
@@ -146,8 +164,8 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
     }
 
     private void enableInAppMessages(Integer inAppMessageRefreshTypeIndex) {
-        final InAppMessageRefreshType inAppMessageRefreshType = InAppMessageRefreshType.valueOf(inAppMessageRefreshTypeIndex);
-        final SMInAppRefreshType smInAppRefreshType = inAppMessageRefreshType.getSmInAppRefreshType();
+        final InAppMessageRefreshType refreshType = InAppMessageRefreshType.valueOf(inAppMessageRefreshTypeIndex);
+        final SMInAppRefreshType smInAppRefreshType = refreshType.getSmInAppRefreshType();
 
         smManager.enableInAppMessages(smInAppRefreshType);
     }
@@ -169,47 +187,44 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
 
     @ReactMethod
     public void getInAppMessages(final Callback successCallback) {
-        smManager.getInAppMessages(new SMInAppMessageReturn() {
-            @Override
-            public void onRetrieve(ArrayList<SMInAppMessage> inAppMessages) {
-                WritableArray resultingMessagesArray = new WritableNativeArray();
+        smManager.getInAppMessages(inAppMessages -> {
+            WritableArray resultingMessagesArray = new WritableNativeArray();
 
-                for (SMInAppMessage message : inAppMessages) {
-                    WritableMap messageMap = new WritableNativeMap();
+            for (SMInAppMessage message : inAppMessages) {
+                WritableMap messageMap = new WritableNativeMap();
 
-                    messageMap.putString("id", message.id);
-                    messageMap.putString("title", message.title);
-                    messageMap.putString("body", message.getBody());
-                    messageMap.putDouble("creationDate", message.getCreationDate());
-                    messageMap.putDouble("expirationDate", message.getExpirationDate());
-                    messageMap.putDouble("receptionDate", message.getReceptionDate());
-                    messageMap.putBoolean("hasBeenSeen", message.hasBeenSeen());
-                    messageMap.putDouble("type", message.getType().getValue());
+                messageMap.putString("id", message.id);
+                messageMap.putString("title", message.title);
+                messageMap.putString("body", message.getBody());
+                messageMap.putDouble("creationDate", message.getCreationDate());
+                messageMap.putDouble("expirationDate", message.getExpirationDate());
+                messageMap.putDouble("receptionDate", message.getReceptionDate());
+                messageMap.putBoolean("hasBeenSeen", message.hasBeenSeen());
+                messageMap.putDouble("type", message.getType().getValue());
 
-                    WritableArray buttonsArray = new WritableNativeArray();
+                WritableArray buttonsArray = new WritableNativeArray();
 
-                    SMNotificationButton buttons[] = message.getButtons();
+                SMNotificationButton[] buttons = message.getButtons();
 
-                    if(buttons != null) {
-                        for(SMNotificationButton button : buttons) {
-                            WritableMap buttonMap = new WritableNativeMap();
+                if(buttons != null) {
+                    for(SMNotificationButton button : buttons) {
+                        WritableMap buttonMap = new WritableNativeMap();
 
-                            buttonMap.putString("id", button.id);
-                            buttonMap.putString("value", button.value);
-                            buttonMap.putString("label", button.label);
-                            buttonMap.putInt("type", button.type);
+                        buttonMap.putString("id", button.id);
+                        buttonMap.putString("value", button.value);
+                        buttonMap.putString("label", button.label);
+                        buttonMap.putInt("type", button.type);
 
-                            buttonsArray.pushMap(buttonMap);
-                        }
+                        buttonsArray.pushMap(buttonMap);
                     }
-
-                    messageMap.putArray("buttons", buttonsArray);
-
-                    resultingMessagesArray.pushMap(messageMap);
                 }
 
-                successCallback.invoke(resultingMessagesArray);
+                messageMap.putArray("buttons", buttonsArray);
+
+                resultingMessagesArray.pushMap(messageMap);
             }
+
+            successCallback.invoke(resultingMessagesArray);
         });
     }
 
@@ -268,24 +283,28 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
 
     @ReactMethod
     public void executeButtonAction(final String buttonId, final String messageId, final Callback successCallback, final Callback errorCallback) {
-        smManager.getInAppMessages(new SMInAppMessageReturn() {
-            @Override
-            public void onRetrieve(ArrayList<SMInAppMessage> inAppMessages) {
-                for(SMInAppMessage message : inAppMessages) {
-                    if(message.id.equals(messageId)) {
-                        for(SMNotificationButton button : message.getButtons()) {
-                            if(button.id.equals(buttonId)) {
+        smManager.getInAppMessages(inAppMessages -> {
+            for(SMInAppMessage message : inAppMessages) {
+                if(message.id.equals(messageId))
+                {
+                    SMNotificationButton[] buttons = message.getButtons();
+                    if (buttons != null)
+                    {
+                        for (SMNotificationButton button : message.getButtons())
+                        {
+                            if (button.id.equals(buttonId))
+                            {
                                 smManager.executeButtonAction(reactContext, button, message);
                                 successCallback.invoke();
                                 return;
                             }
                         }
-                        errorCallback.invoke("buttonId does not exist in message.");
-                        return;
                     }
+                    errorCallback.invoke("buttonId does not exist in message.");
+                    return;
                 }
-                errorCallback.invoke(String.format("No message with id %s found", messageId));
             }
+            errorCallback.invoke(String.format("No message with id %s found", messageId));
         });
     }
 
@@ -320,13 +339,17 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
 
     @ReactMethod
     public void enableNotifications(Boolean enable) {
-        if (enable) {
+        if (Boolean.TRUE.equals(enable)) {
             smManager.enableNotifications();
         } else {
             smManager.disableNotifications();
         }
     }
 
+    public static void enableNotifications() {
+        SMManager.getInstance().enableNotifications();
+    }
+
     @ReactMethod
     public void displayLastReceivedRemotePushNotification(String templateId) {
         final Activity currentActivity = getCurrentActivity();
@@ -437,7 +460,8 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
                 thisActivity.runOnUiThread(() -> {
                     if (!areObserverStarted)
                     {
-                        Log.d("RNSelligent", "Instantiating the observers on the UI thread");
+                        Log.d(RN_SELLIGENT_NAME, "Instantiating the observers on the UI thread");
+                        SMObserverManager observerManager = smManager.getObserverManager();
 
                         // Token received
                         final Observer<String> tokenObserver = token -> {
@@ -446,7 +470,7 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
                             final WritableMap data = broadcastEventDataParser.wrap(token);
                             rctDeviceEventEmitter.emit(eventName, getBroadcastData(eventName, data));
                         };
-                        SMManager.getInstance().getObserverManager().observeToken(thisActivity, tokenObserver);
+                        observerManager.observeToken(thisActivity, tokenObserver);
 
                         // Device id received
                         final Observer<String> deviceIdObserver = deviceId -> {
@@ -455,7 +479,7 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
                             final WritableMap data = broadcastEventDataParser.wrap(deviceId);
                             rctDeviceEventEmitter.emit(eventName, getBroadcastData(eventName, data));
                         };
-                        SMManager.getInstance().getObserverManager().observeDeviceId(thisActivity, deviceIdObserver);
+                        observerManager.observeDeviceId(thisActivity, deviceIdObserver);
 
                         // InApp messages received
                         final Observer<SMInAppMessage[]> inAppMessageObserver = inAppMessages -> {
@@ -467,7 +491,7 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
                                 rctDeviceEventEmitter.emit(eventName, getBroadcastData(eventName, data));
                             }
                         };
-                        SMManager.getInstance().getObserverManager().observeInAppMessages(thisActivity, inAppMessageObserver);
+                        observerManager.observeInAppMessages(thisActivity, inAppMessageObserver);
 
                         // Button clicked
                         final Observer<SMNotificationButton> clickedButtonObserver = button -> {
@@ -479,21 +503,21 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
                                 rctDeviceEventEmitter.emit(eventName, getBroadcastData(eventName, data));
                             }
                         };
-                        SMManager.getInstance().getObserverManager().observeClickedButton(thisActivity, clickedButtonObserver);
+                        observerManager.observeClickedButton(thisActivity, clickedButtonObserver);
 
                         // Message dismissed
                         final Observer<Void> dismissedMessageObserver = object -> {
                             String eventName = BroadcastEventType.WillDismissNotification.getBroadcastEventType();
                             rctDeviceEventEmitter.emit(eventName, getBroadcastData(eventName, null));
                         };
-                        SMManager.getInstance().getObserverManager().observeDismissedMessage(thisActivity, dismissedMessageObserver);
+                        observerManager.observeDismissedMessage(thisActivity, dismissedMessageObserver);
 
                         // Message displayed
                         final Observer<Void> displayedMessageObserver = object -> {
                             String eventName = BroadcastEventType.WillDisplayNotification.getBroadcastEventType();
                             rctDeviceEventEmitter.emit(eventName, getBroadcastData(eventName, null));
                         };
-                        SMManager.getInstance().getObserverManager().observeDisplayedMessage(thisActivity, displayedMessageObserver);
+                        observerManager.observeDisplayedMessage(thisActivity, displayedMessageObserver);
 
                         // Push received
                         final Observer<SMNotificationMessage> pushReceivedObserver = notificationMessage -> {
@@ -505,19 +529,17 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
                                 rctDeviceEventEmitter.emit(eventName, getBroadcastData(eventName, data));
                             }
                         };
-                        SMManager.getInstance().getObserverManager().observePushReceived(thisActivity, pushReceivedObserver);
+                        observerManager.observePushReceived(thisActivity, pushReceivedObserver);
 
                         // Custom events
-                        final Observer<String> customEventObserver = event -> {
-                            rctDeviceEventEmitter.emit(BroadcastEventType.TriggeredCustomEvent.getBroadcastEventType(), getBroadcastData(event, null));
-                        };
-                        SMManager.getInstance().getObserverManager().observeEvent(thisActivity, customEventObserver);
+                        final Observer<String> customEventObserver = event -> rctDeviceEventEmitter.emit(BroadcastEventType.TriggeredCustomEvent.getBroadcastEventType(), getBroadcastData(event, null));
+                        observerManager.observeEvent(thisActivity, customEventObserver);
 
                         areObserverStarted = true;
                     }
                     else
                     {
-                        Log.d("RNSelligent", "Observers already instantiated");
+                        Log.d(RN_SELLIGENT_NAME, "Observers already instantiated");
                     }
                 });
             }
@@ -601,5 +623,4 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
 
     @Override
     public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) { }
-
 }

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

@@ -11,6 +11,7 @@ import com.selligent.sdk.SMEventUserUnregister;
 import java.util.Hashtable;
 
 class SMEventFactory {
+    private SMEventFactory(){}
 
     public static SMEvent getSMEvent(Event event, SMCallback callback) {
         final EventType type = event.getType();
@@ -27,7 +28,7 @@ class SMEventFactory {
             case UserLogout:
                 return new SMEventUserLogout(email, data, callback);
             case Custom:
-                return new SMEvent(data, callback);
+                return new SMEvent(null, data, callback);
             default:
                 throw new IllegalArgumentException("SMManager sendEvent failed: you provided an invalid EventType");
         }

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

@@ -1,8 +1,10 @@
 package com.selligent;
 
 import com.selligent.sdk.SMSettings;
+import com.selligent.sdk.SMFrameworkType;
 
 class SMSettingsFactory {
+    private SMSettingsFactory(){}
 
     public static SMSettings getSMSettings(Settings settings) {
         final SMSettings smSettings = new SMSettings();
@@ -16,6 +18,7 @@ class SMSettingsFactory {
         smSettings.NotificationChannelId = settings.getNotificationChannelId();
         smSettings.NotificationChannelName = settings.getNotificationChannelName();
         smSettings.NotificationChannelDescription = settings.getNotificationChannelDescription();
+        smSettings.FrameworkType = SMFrameworkType.reactNative;
 
         final ClearCacheIntervalValue clearCacheIntervalValue = settings.getClearCacheIntervalValue();
         if (clearCacheIntervalValue != null) {

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

@@ -1,7 +1,7 @@
 package com.selligent;
 
 
-import java.util.HashMap;
+import java.util.Map;
 
 class Settings {
 
@@ -22,6 +22,7 @@ class Settings {
     private String notificationChannelId = "SMChannel001";
     private String notificationChannelName = "SMDefaultChannel";
     private String notificationChannelDescription = "";
+    private Boolean enableAndroidLogging = false;
 
     private Settings() { }
 
@@ -85,7 +86,9 @@ class Settings {
         return notificationChannelDescription;
     }
 
-    public static Settings fromHashMap(HashMap<String, Object> settingsHashMap) {
+    public Boolean getEnableAndroidLogging() { return enableAndroidLogging; }
+
+    public static Settings fromHashMap(Map<String, Object> settingsHashMap) {
         final Settings settings = new Settings();
 
         settings.url = (String) settingsHashMap.get("url");
@@ -101,7 +104,7 @@ class Settings {
             settings.notificationLargeIcon = (String) settingsHashMap.get("notificationLargeIcon");
         }
 
-        if(settingsHashMap.containsKey("notificationIconColor")) {
+        if (settingsHashMap.containsKey("notificationIconColor")) {
             settings.notificationIconColor = (String) settingsHashMap.get("notificationIconColor");
         }
 
@@ -120,24 +123,33 @@ 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");
         }
 
+        if (settingsHashMap.containsKey("enableAndroidLogging")) {
+            settings.enableAndroidLogging = (Boolean) settingsHashMap.get("enableAndroidLogging");
+        }
+
         final Double clearCacheIndex = (Double) settingsHashMap.get("clearCacheIntervalValue");
         if (clearCacheIndex != null) {
             settings.clearCacheIntervalValue = ClearCacheIntervalValue.valueOf(clearCacheIndex.intValue());
         }
+
         final Double inAppMsgRefreshIndex =  (Double) settingsHashMap.get("inAppMessageRefreshType");
         if (inAppMsgRefreshIndex != null) {
             settings.inAppMessageRefreshType = InAppMessageRefreshType.valueOf(inAppMsgRefreshIndex.intValue());
         }
+
         final Double remoteMsgRefreshIndex =  (Double) settingsHashMap.get("remoteMessageDisplayType");
         if (remoteMsgRefreshIndex != null) {
             settings.remoteMessageDisplayType = RemoteMessageDisplayType.valueOf(remoteMsgRefreshIndex.intValue());

package/documentation/README.md

@@ -73,7 +73,9 @@ The following properties can be used in the `selligent.json` to further configur
 | remoteMessageDisplayType                    | [enum](#remotemessagesdisplaytype) | The behaviour when receiving a push notification with the app in foreground |
 | appGroupId                                  | string |(iOS Only) The appgroup id necessary for the correct communication between the app and the app extensions |
 | shouldClearBadge                            | boolean | (iOS Only) Whether or not, clicking a push notification should reset the badge number |
-| shouldDisplayRemoteNotification             | boolean | (iOS Only) Whether or not, the SDK should try to display the content linked to a push message (usually, inapp messages) or it will be handled customly |
+| shouldDisplayRemoteNotification             | boolean | (iOS Only) Whether or not, the SDK should try to display the content linked to a push message (usually, inapp messages) or it will be handled customly 
+| enableiOSLogging                            | [enum](#iosloglevel) | Log level used since the app launch |
+| enableAndroidLogging                        | boolean | (Android Only) Whether or not, the SDK logging will be enabled since the app launch |
 | doNotListenToThePush                        | boolean | (Android Only) Whether or not, the SDK will listen for pushs from google |
 | doNotFetchTheToken                          | boolean | (Android Only) Whether or not, the SDK will listen for push tokens from google |
 | loadCacheAsynchronously                     | boolean | (Android Only) Whether or not, the SDK load the cache asynchronously |
@@ -89,7 +91,44 @@ The following properties can be used in the `selligent.json` to further configur
 
 Follow the [iOS](https://github.com/SelligentMarketingCloud/MobileSDK-iOS/tree/master/Documentation#create-an-apns-key) & [Android](https://github.com/SelligentMarketingCloud/MobileSDK-Android/tree/master/Documentation#creating-an-application) native SDKs guides in order to optin for push notifications in Apple & Google.
 
-**For iOS**, there are some extra steps you need to follow in the native part of the ReactNative project:
+**For Android**, if targeting API level 33 and above:
+1. Add this to request the push permission and let the SDK know when it is accepted, in the activity where you want to:
+```java
+import com.selligent.RNSelligent;
+
+public class MainActivity extends ReactActivity {
+  final int NOTIFICATION_PERMISSION_REQUEST_CODE = 1111;
+
+  @Override
+  public void onStart()
+  {
+    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.S_V2)
+    {
+      if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED)
+      {
+        ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.POST_NOTIFICATIONS}, NOTIFICATION_PERMISSION_REQUEST_CODE);
+      }
+    }
+    
+    super.onStart();
+  }
+
+  @Override
+  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults)
+  {
+      super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+      if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE)
+      {
+          if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED)
+          {
+              RNSelligent.enableNotifications();
+          }
+      }
+  }
+```
+
+**For iOS**:
 
 1. For push notifications you need to delegate some of the `AppDelegate.m` methods to the SDK:
 
@@ -158,14 +197,16 @@ Follow the [iOS](https://github.com/SelligentMarketingCloud/MobileSDK-iOS/tree/m
     ```javascript
     import Selligent from "@selligent-marketing-cloud/selligent-react-native"; // Add Selligent import
     
-    Selligent.enableNotifications(
-        (response) => { // success callback
-        },
-        (error) => { // error callback
-        },
-        true
-    )
-
+    if (Platform.OS === 'ios') {
+        Selligent.enableNotifications(
+            (response) => { // success callback
+            },
+            (error) => { // error callback
+            },
+            true
+        )
+    }
+    
     Selligent.registerForProvisionalRemoteNotification(
         () => { // success callback
         }
@@ -231,7 +272,7 @@ This is because the JS layer is loaded **after** the native iOS SDK executes the
     if (Platform.OS === 'ios') {
          /* Tells the Selligent SDK to execute the action associated to the last push clicked, when using `delayedPushAction` feature.
             If you are having problems with deeplinks or 'Push + InApp Message' where the splash screen gets stuck or the push action not visible,
-            make sure you control when the splash screen is dismissed and call this method afterwards (if the dismiss is async, call this method once the async process is completely finished)
+            make sure you control when the splash screen is dismissed (i.e https://docs.expo.dev/versions/latest/sdk/splash-screen/) and call this method afterwards (if the dismiss is async, call this method once the async process is completely finished)
         */
         Selligent.executePushAction()
     }

package/index.android.js

@@ -33,15 +33,6 @@ export default {
 		RNSelligent.enableInAppMessages({ enabled })
 	},
 
-	/**
-	 * To check if in app messages are enabled on Android.
-	 *
-	 * @param {function} successCallback Callback function on success.
-	 */
-	areInAppMessagesEnabled: function (successCallback) {
-		return RNSelligent.areInAppMessagesEnabled(successCallback)
-	},
-
 	// Log
 	/**
 	 * Enable logging messages on Android.

package/index.js

@@ -37,6 +37,15 @@ export default Object.assign(
 		},
 
 		// InAppMessage
+		
+		/**
+		 * To check if in app messages are enabled.
+		 *
+		 * @param {function} successCallback Callback function on success.
+		 */
+		areInAppMessagesEnabled: function (successCallback) {
+			return RNSelligent.areInAppMessagesEnabled(successCallback)
+		},
 
 		/**
 		 * Gets all known (and not deleted/expired) in app messages.

package/ios/RNSelligentMapper.m

@@ -44,6 +44,10 @@ RCT_EXPORT_METHOD(registerForProvisionalRemoteNotification) {
   [RNSelligent registerForProvisionalRemoteNotification];
 }
 
+RCT_EXPORT_METHOD(displayLastReceivedNotification) {
+  [RNSelligent displayLastReceivedNotification];
+}
+
 RCT_EXPORT_METHOD(displayLastReceivedRemotePushNotification:(NSString *)templateId) {
   [RNSelligent displayLastReceivedRemotePushNotificationWithTemplateId:templateId];
 }
@@ -58,6 +62,10 @@ RCT_EXPORT_METHOD(enableInAppMessages:(BOOL)enabled) {
   [RNSelligent enableInAppMessages:enabled];
 }
 
+RCT_EXPORT_METHOD(areInAppMessagesEnabled:(RCTResponseSenderBlock)callback) {
+  callback(@[@([RNSelligent areInAppMessagesEnabled]), [NSNull null]]);
+}
+
 RCT_EXPORT_METHOD(getInAppMessages:(RCTResponseSenderBlock)callback) {
   callback(@[[RNSelligent getInAppMessages] ?: [NSNull null], [NSNull null]]);
 }
@@ -127,10 +135,6 @@ RCT_EXPORT_METHOD(subscribeToEvents:(NSArray<NSString *> *)events) {
   [RNSelligent subscribeToEvents:events];
 }
 
-RCT_EXPORT_METHOD(displayLastReceivedNotification) {
-  [RNSelligent displayLastReceivedNotification];
-}
-
 - (void) sendBroadcastEventWithName:(NSString * _Nonnull)name type:(NSString * _Nonnull)type data:(NSDictionary * _Nullable)data {
   [self sendEventWithName:name body:@{@"data": data ?: [NSNull null], @"broadcastEventType": type}];
 }

package/package.json

@@ -4,7 +4,7 @@
   },
   "name": "@selligent-marketing-cloud/selligent-react-native",
   "title": "Selligent React Native",
-  "version": "3.2.6",
+  "version": "3.3.0",
   "description": "React Native wrapper for the Selligent Marketing Cloud Android and iOS SDKs",
   "main": "index.js",
   "repository": {
@@ -38,10 +38,9 @@
     "test": "jest"
   },
   "files": [
-    "/RNSelligent.podspec",
+    "/RNSelligentMapper.podspec",
     "/*.js",
     "/*.ts",
-    "/ios/RNSelligentMobileSDK.xcframework",
     "/ios/*.h",
     "/ios/*.m",
     "/android/src/main",