@selligent-marketing-cloud/selligent-react-native 3.3.2 → 3.5.0

package/README.md

@@ -6,14 +6,14 @@ This module provides an API for the usage of the Selligent Mobile SDKs in React
 
 This module supports the following SDK and tools:
 
-> **IMPORTANT** This module doesn't currently support REACT NATIVE'S NEW ARCHITECTURE! The following library contains React native modules, that are tailored to and can only be used in React Native's legacy architecture, that will be deprecated in the future when the new architecture will be stable.
+> **IMPORTANT** This module isn't built using ReactNative's new architecture! It is however compatible with apps that do adopt the new architecture, as far as they are using latest ReactNative's versions.
 
 | SDK                                                                            | Version |
 | ------------------------------------------------------------------------------ | ------- |
-| [Android SDK](https://github.com/SelligentMarketingCloud/MobileSDK-Android)    | 4.3.0   |
-| [iOS SDK](https://github.com/SelligentMarketingCloud/MobileSDK-iOS)            | 3.6.1   |
-| ReactNative                                                                    | 0.71.8  |
-| Expo SDK                                                                       | 48      |
+| [Android SDK](https://github.com/SelligentMarketingCloud/MobileSDK-Android)    | 4.4.0   |
+| [iOS SDK](https://github.com/SelligentMarketingCloud/MobileSDK-iOS)            | 3.8.0   |
+| ReactNative                                                                    | 0.72.4  |
+| Expo SDK                                                                       | 49      |
 
 ## Installation
 
@@ -41,46 +41,7 @@ This module supports the following SDK and tools:
 
 ### Android Specific Installation
 
-> **IMPORTANT:** Since version 2.6.0 of this module we require your app to use the Android Gradle Plugin version 4.2.0 or higher in order to build on Android. This is the default Android Gradle Plugin version since React Native version 0.64.0 but can be manually increased in older versions of React Native.
-
-> ### **Attention for Huawei developers!**
->
-> In order to use this module on Huawei devices (without Goggle Play services), you should add the following dependencies in the `build.gradle` files of the Android project in your React Native project:
->
-> In your Android project's root `build.gradle` file:
->
-> ```gradle
->
-> buildscript {
->  repositories {
->   maven { url 'https://developer.huawei.com/repo/' }
->  }
->  dependencies {
->   classpath 'com.huawei.agconnect:agcp:1.6.0.300'
->  }
-> }
->
-> allProjects: {
->   repositories: {
->     maven { url 'https://developer.huawei.com/repo/' }
->   }
-> }
->
-> ```
->
-> In your app module's `build.gradle` file:
->
-> ```gradle
->
-> apply plugin: 'com.huawei.agconnect'
->
-> dependencies {
->   api 'com.huawei.hms:base:6.2.0.300'
->   api 'com.huawei.hms:push:6.1.0.300'
->   api 'com.huawei.hms:maps:6.2.0.301'
-> }
->
-> ```
+> **IMPORTANT:** Since version 2.6.0 of this module we require your app to use the Android Gradle Plugin version 7.0.0 or higher in order to build on Android.
 
 <details>
 <summary>Without autolinking (RN 0.59 and below)</summary>
@@ -101,10 +62,10 @@ This module supports the following SDK and tools:
 
    buildscript {
        dependencies {
-           // Make sure your Gradle plugin version is >= 4.2.0
-           classpath("com.android.tools.build:gradle:4.2.0")
+           // Make sure your Gradle plugin version is >= 7.0.0
+           classpath("com.android.tools.build:gradle:7.0.0")
            // Add the following:
-           classpath 'com.google.gms:google-services:4.3.3'
+           classpath 'com.google.gms:google-services:4.3.15'
        }
    }
    ```
@@ -170,7 +131,7 @@ This module supports the following SDK and tools:
    buildscript {
        dependencies {
            // Add the following:
-           classpath 'com.google.gms:google-services:4.3.3'
+           classpath 'com.google.gms:google-services:4.3.15'
        }
    }
    ```
@@ -213,13 +174,15 @@ This module supports the following SDK and tools:
 
     > Do not check the "copy if needed" option to make sure you only have to manage one selligent.json file
 
-3. Add the native iOS SDK dependency in your Podfile: `s.dependency "SelligentMobileSDK/Framework", "3.6.1"` or download it manually from [here](https://github.com/SelligentMarketingCloud/MobileSDK-iOS/tree/master/Framework) and drag and drop it into you **Xcode project**.
+3. Add the native iOS SDK dependency in your Podfile: `s.dependency "SelligentMobileSDK/Framework", "3.8.0"` or download it manually from [here](https://github.com/SelligentMarketingCloud/MobileSDK-iOS/tree/master/Framework) and drag and drop it into you **Xcode project**.
 
-4. Execute `pod install` in the `/ios` folder
+4. Add the RNSelligentMapper pod in your Podfile: `pod 'RNSelligentMapper', :path => '../node_modules/@selligent-marketing-cloud/selligent-react-native/RNSelligentMapper.podspec'`.
 
-5. From now on, open the `.xcworkspace` file to make changes in Xcode
+5. Execute `pod install` in the `/ios` folder
 
-6. Bootstrap the SDK in the `application:didFinishLaunchingWithOptions:` of the `AppDelegate.mm`
+6. From now on, open the `.xcworkspace` file to make changes in Xcode
+
+7. Bootstrap the SDK in the `application:didFinishLaunchingWithOptions:` of the `AppDelegate.mm`
 
     ```objective-c
     @import RNSelligentMobileSDK;

package/android/build.gradle

@@ -8,19 +8,29 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:8.1.2'
     }
 }
 
 apply plugin: 'com.android.library'
 
-
 android {
-    compileSdkVersion 33
+    namespace 'com.selligent'
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
+    }
+
+    buildFeatures {
+        buildConfig true
+    }
+
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+        }
     }
 }
 
@@ -33,7 +43,7 @@ androidComponents {
                 variant.buildConfigFields.put("SELLIGENT_SETTINGS", new BuildConfigField("String", "\"" + selligentSettings + "\"", "Selligent settings"))
             }
             catch (Exception ignored) {
-                throw new Exception("Selligent requires Android Gradle plugin version 4.2.0 or higher.")
+                throw new Exception("Selligent requires Android Gradle plugin version 8.1.0 or higher.")
             }
         }
     })
@@ -53,40 +63,45 @@ dependencies {
         exclude group:'com.facebook.fbjni'
         exclude group:'com.facebook.yoga'
     }
-    implementation 'com.selligent.sdk:selligent_mobile_sdk:4.3.0'
+    implementation 'com.selligent.sdk:selligent_mobile_sdk:4.4.0'
     implementation 'com.google.code.gson:gson:2.9.0'
-    implementation 'com.google.firebase:firebase-messaging:23.0.8'
+    implementation 'com.google.firebase:firebase-messaging:23.2.1'
     implementation 'androidx.work:work-runtime:2.8.1'
     implementation 'androidx.concurrent:concurrent-futures:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
+    implementation files("libs/RNSelligentMobileSDK.aar")
 }
 
 def loadSelligentSettings(variant) {
     def currentFlavor = getCurrentFlavor()
-    def defaultSelligentFileName = "selligent.json"
-    File defaultFile = new File("$project.rootDir/../$defaultSelligentFileName")
-
-    if (currentFlavor !== "") {
-        defaultFile = new File("$project.rootDir/../$currentFlavor/$defaultSelligentFileName")
-    }
-
-    def variantSelligentFileName = "selligent.${variant.getName()}.json"
-    File variantFile = new File("$project.rootDir/../$variantSelligentFileName")
-
+    def defaultFileName = "selligent.json"
+    def variantFileName = "selligent.${variant.getName()}.json"
     def resultingSettings = null
 
+    File variantFile = new File("$project.rootDir/../$variantFileName")
+    File defaultFile = new File("$project.rootDir/../$defaultFileName")
+    File flavorFile = new File("$project.rootDir/../$currentFlavor/$defaultFileName")
+
     if (variantFile.exists()) {
-        println("Reading Selligent properties for variant ${variant.getName()} using $variantSelligentFileName")
+        println("Reading Selligent properties for variant ${variant.getName()} from $variantFile.path")
         resultingSettings = ""
 
         variantFile.eachLine { String line ->
             resultingSettings += line.replace("\"", "\\\"").replaceAll("\\s", "")
         }
     }
+    else if (currentFlavor != "" && flavorFile.exists()) {
+        println("Reading Selligent properties for flavor $currentFlavor using $flavorFile.path")
+        resultingSettings = ""
+
+        flavorFile.eachLine { String line ->
+            resultingSettings += line.replace("\"", "\\\"").replaceAll("\\s", "")
+        }
+    }
     else if (defaultFile.exists()) {
-        println("Reading Selligent properties from default ${defaultFile.name} (no variant specific $variantSelligentFileName was found)")
+        println("Reading default Selligent properties from ${defaultFile.path} (no variant specific nor flavor $defaultFileName were found)")
         resultingSettings = ""
 
         defaultFile.eachLine { String line ->

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1 @@
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.selligent">
-
-</manifest>
-  
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.selligent" />

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

@@ -7,6 +7,7 @@ import android.text.TextUtils;
 
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
+import com.selligent.rnmobilesdk.BroadcastDataFactory;
 
 
 class EventReceiver extends BroadcastReceiver {

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

@@ -30,6 +30,18 @@ import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.selligent.rnmobilesdk.BroadcastEventType;
+import com.selligent.rnmobilesdk.ButtonBroadcastEventDataParser;
+import com.selligent.rnmobilesdk.DeviceIdBroadcastEventDataParser;
+import com.selligent.rnmobilesdk.Event;
+import com.selligent.rnmobilesdk.GCMTokenBroadcastEventDataParser;
+import com.selligent.rnmobilesdk.InAppMessageBroadcastEventDataParser;
+import com.selligent.rnmobilesdk.InAppMessageRefreshType;
+import com.selligent.rnmobilesdk.NotificationMessageBroadcastEventDataParser;
+import com.selligent.rnmobilesdk.RemoteMessageDisplayType;
+import com.selligent.rnmobilesdk.SMEventFactory;
+import com.selligent.rnmobilesdk.SMSettingsFactory;
+import com.selligent.rnmobilesdk.Settings;
 import com.selligent.sdk.SMCallback;
 import com.selligent.sdk.SMEvent;
 import com.selligent.sdk.SMForegroundGcmBroadcastReceiver;

package/documentation/README.md

@@ -74,7 +74,7 @@ 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 |
@@ -93,12 +93,15 @@ 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 Android**, if targeting API level 33 and above:
+
 1. Add the following line to AndroidManifest.xml:
+
     ```xml
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     ```
 
 2. Add this native code 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;
     
@@ -867,7 +870,7 @@ Defines the type of an event.
 | USER_REGISTER   | number | 90    | Used to send a register event to the server with the custom email/profile identifier of the user, with the purpose of linking the device to an user and optionally storing some data at Selligent platform side. This event will create a new user in your Selligent database, if none was found (you can use an alternate key/value field to search for the user, in the data object, since by default the `email` one will use the `MAIL` column in your Selligent database). |
 | USER_UNREGISTER | number | 91    | Used to send an unregister event to the server with the custom email/profile identifier of the user, with the purpose of keeping track of a REGISTERED flag and optionally storing some data at Selligent platform side (this event is not unlinking the user from the device (automatically), at the moment). |
 | USER_LOGIN      | number | 92    | Used to send a login event to the server with the custom email/profile identifier of the user, with the purpose of linking the device to an user and optionally storing some data at Selligent platform side. This event will **NOT** create a new user in your Selligent database, if none found. |
-| USER_LOGOUT     | number | 93    | UUsed to send a logout event to the server with the custom email/profile identifier of the user, with the purpose of keeping track of a LOGGED flag and optionally storing some data at Selligent platform side (this event is not unlinking the user from the device (automatically), at the moment). |
+| USER_LOGOUT     | number | 93    | Used to send a logout event to the server with the custom email/profile identifier of the user, with the purpose of keeping track of a LOGGED flag and optionally storing some data at Selligent platform side (this event is not unlinking the user from the device (automatically), at the moment). |
 | CUSTOM          | number | 94    | Used to send a custom event to the server, with the purpose of keeping track of storing some data at Selligent platform side. |
 
 ### NotificationButtonType

package/package.json

@@ -4,7 +4,7 @@
   },
   "name": "@selligent-marketing-cloud/selligent-react-native",
   "title": "Selligent React Native",
-  "version": "3.3.2",
+  "version": "3.5.0",
   "description": "React Native wrapper for the Selligent Marketing Cloud Android and iOS SDKs",
   "main": "index.js",
   "repository": {
@@ -32,10 +32,11 @@
     "metro-react-native-babel-preset": "^0.76.4",
     "react": "18.0.0",
     "react-native": "^0.69.10",
-    "ts-jest": "^29.1.0"
+    "ts-jest": "^29.1.0",
+    "jest-junit": "^16.0.0"
   },
   "scripts": {
-    "test": "jest"
+    "test": "jest --coverage --reporters=jest-junit"
   },
   "files": [
     "/RNSelligentMapper.podspec",
@@ -43,8 +44,10 @@
     "/*.ts",
     "/ios/*.h",
     "/ios/*.m",
+    "/android/libs",
     "/android/src/main",
     "/android/build.gradle",
+    "/android/settings.gradle",
     "/documentation/README.md"
   ]
 }

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

@@ -1,47 +0,0 @@
-package com.selligent;
-
-import android.content.Intent;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.selligent.sdk.SMManager;
-
-import java.util.HashMap;
-import java.util.Map;
-
-class BroadcastDataFactory {
-    private BroadcastDataFactory(){}
-
-    private static Map<String, BroadcastEventDataParser> getBroadcastDataParserMap()
-    {
-        HashMap<String, BroadcastEventDataParser> parser = new HashMap<>();
-
-        parser.put(SMManager.BROADCAST_EVENT_RECEIVED_IN_APP_MESSAGE, new InAppMessageBroadcastEventDataParser());
-        parser.put(SMManager.BROADCAST_EVENT_BUTTON_CLICKED, new ButtonBroadcastEventDataParser());
-        parser.put(SMManager.BROADCAST_EVENT_RECEIVED_GCM_TOKEN, new GCMTokenBroadcastEventDataParser());
-
-        return parser;
-    }
-
-    public static WritableMap getBroadcastData(String smBroadcastEventType, Intent intent) {
-        final WritableMap broadcastData = new WritableNativeMap();
-
-        final BroadcastEventType broadcastEventType = BroadcastEventType.fromSMBroadcastEventType(smBroadcastEventType);
-        String resultingBroadcastEventType = smBroadcastEventType;
-        if (broadcastEventType != null) {
-            resultingBroadcastEventType = broadcastEventType.getBroadcastEventType();
-        }
-        broadcastData.putString("broadcastEventType", resultingBroadcastEventType);
-
-        final BroadcastEventDataParser broadcastEventDataParser = getBroadcastDataParserMap().get(smBroadcastEventType);
-
-        if (broadcastEventDataParser != null) {
-            final WritableMap resultingData = broadcastEventDataParser.parse(intent);
-            broadcastData.putMap("data", resultingData);
-        } else {
-            broadcastData.putMap("data", null);
-        }
-
-        return broadcastData;
-    }
-}

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

@@ -1,9 +0,0 @@
-package com.selligent;
-
-import android.content.Intent;
-
-import com.facebook.react.bridge.WritableMap;
-
-interface BroadcastEventDataParser {
-    WritableMap parse(Intent intent);
-}

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

@@ -1,37 +0,0 @@
-package com.selligent;
-
-import com.selligent.sdk.SMManager;
-
-enum BroadcastEventType {
-    ButtonClicked("ButtonClicked", SMManager.BROADCAST_EVENT_BUTTON_CLICKED),
-    ReceivedInAppMessage("ReceivedInAppMessage", SMManager.BROADCAST_EVENT_RECEIVED_IN_APP_MESSAGE),
-    WillDisplayNotification("WillDisplayNotification", SMManager.BROADCAST_EVENT_WILL_DISPLAY_NOTIFICATION),
-    WillDismissNotification("WillDismissNotification", SMManager.BROADCAST_EVENT_WILL_DISMISS_NOTIFICATION),
-    ReceivedGCMToken("ReceivedGCMToken", SMManager.BROADCAST_EVENT_RECEIVED_GCM_TOKEN),
-    ReceivedNotification("ReceivedRemoteNotification", null),
-    ReceivedDeviceId("ReceivedDeviceId", null),
-    TriggeredCustomEvent("TriggeredCustomEvent", null);
-
-    private String broadcastEventType;
-    private String smBroadcastEventType;
-
-    public String getBroadcastEventType() {
-        return broadcastEventType;
-    }
-
-    BroadcastEventType(String broadcastEventType, String smBroadcastEventType) {
-        this.broadcastEventType = broadcastEventType;
-        this.smBroadcastEventType = smBroadcastEventType;
-    }
-
-    public static BroadcastEventType fromSMBroadcastEventType(String smEventType) {
-        BroadcastEventType result = null;
-        for (BroadcastEventType broadcastEventType: values()) {
-            if(smEventType.equals(broadcastEventType.smBroadcastEventType)) {
-                result = broadcastEventType;
-            }
-        }
-
-        return result;
-    }
-}

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

@@ -1,82 +0,0 @@
-package com.selligent;
-
-import com.selligent.sdk.SMLinkAction;
-
-public enum ButtonAction
-{
-  unknown(100),
-  phone(101),
-  sms(102),
-  mail(103),
-  url(104),
-  externalApp(105),
-  rateApp(106),
-  broadcastEvent(107),
-  passbook(111),
-  deeplink(112),
-  simple(113);
-
-  private final int buttonAction;
-
-  ButtonAction(int action) { this.buttonAction = action; }
-
-  public static ButtonAction valueOf(int x)
-  {
-    switch(x) {
-      case 101:
-        return phone;
-      case 102:
-        return sms;
-      case 103:
-        return mail;
-      case 104:
-        return url;
-      case 105:
-        return externalApp;
-      case 106:
-        return rateApp;
-      case 107:
-        return broadcastEvent;
-      case 111:
-        return passbook;
-      case 112:
-        return deeplink;
-      case 113:
-        return simple;
-      default:
-        return unknown;
-    }
-  }
-
-  public static ButtonAction valueOf(SMLinkAction linkAction)
-  {
-    switch(linkAction) {
-      case phone:
-        return phone;
-      case sms:
-        return sms;
-      case mail:
-        return mail;
-      case url:
-        return url;
-      case externalApp:
-        return externalApp;
-      case rateApp:
-        return rateApp;
-      case broadcastEvent:
-        return broadcastEvent;
-      case passbook:
-        return passbook;
-      case deeplink:
-        return deeplink;
-      case simple:
-        return simple;
-    }
-    return unknown;
-  }
-
-  public int getValue()
-  {
-    return buttonAction;
-  }
-}

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

@@ -1,50 +0,0 @@
-package com.selligent;
-
-import android.content.Intent;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.selligent.sdk.SMManager;
-import com.selligent.sdk.SMNotificationButton;
-
-class ButtonBroadcastEventDataParser implements BroadcastEventDataParser {
-    @Override
-    public WritableMap parse(Intent intent) {
-        SMNotificationButton button;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU)
-        {
-            button = intent.getSerializableExtra(SMManager.BROADCAST_DATA_BUTTON, SMNotificationButton.class);
-        }
-        else
-        {
-            button = (SMNotificationButton)intent.getSerializableExtra(SMManager.BROADCAST_DATA_BUTTON);
-        }
-
-        return wrap(button);
-    }
-
-    public WritableMap wrap(SMNotificationButton button)
-    {
-        final WritableMap resultingMap = new WritableNativeMap();
-
-        resultingMap.putString("id", button.id);
-        resultingMap.putInt("type", ButtonAction.valueOf(button.action).getValue());
-        resultingMap.putString("value", button.value);
-        resultingMap.putString("label", button.label);
-
-        if (button.data != null) {
-            final WritableMap buttonData = new WritableNativeMap();
-            for(String dataKey : button.data.keySet()) {
-                buttonData.putString(dataKey, button.data.get(dataKey));
-            }
-
-            if (!buttonData.toHashMap().isEmpty()) {
-                resultingMap.putMap("data", buttonData);
-            } else {
-                resultingMap.putMap("data", null);
-            }
-        }
-
-        return resultingMap;
-    }
-}

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

@@ -1,36 +0,0 @@
-package com.selligent;
-
-import com.selligent.sdk.SMClearCache;
-
-enum ClearCacheIntervalValue {
-    AUTO(1, SMClearCache.Auto),
-    NONE(2, SMClearCache.None),
-    DAY(3, SMClearCache.Day),
-    WEEK(4, SMClearCache.Week),
-    MONTH(5, SMClearCache.Month),
-    QUARTER(6, SMClearCache.Quarter);
-
-    private Integer index;
-    private SMClearCache smClearCache;
-
-    ClearCacheIntervalValue(Integer index, SMClearCache smClearCache) {
-        this.index = index;
-        this.smClearCache = smClearCache;
-    }
-
-    public SMClearCache getSmClearCache() {
-        return smClearCache;
-    }
-
-    public static ClearCacheIntervalValue valueOf(Integer index) {
-        ClearCacheIntervalValue result = null;
-        for(ClearCacheIntervalValue clearCacheIntervalValue : values()) {
-            if(index.equals(clearCacheIntervalValue.index)) {
-                result = clearCacheIntervalValue;
-            }
-        }
-
-        if(result == null) throw new IllegalArgumentException("Invalid clearCacheIntervalValue");
-        return result;
-    }
-}

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

@@ -1,15 +0,0 @@
-package com.selligent;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-
-class DeviceIdBroadcastEventDataParser {
-
-    public WritableMap wrap(String deviceId) {
-        final WritableMap resultingMap = new WritableNativeMap();
-
-        resultingMap.putString("deviceId", deviceId);
-
-        return resultingMap;
-    }
-}

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

@@ -1,51 +0,0 @@
-package com.selligent;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-class Event {
-
-    private EventType type;
-    private String email;
-    private Hashtable<String, String> data;
-
-    private Event() { }
-
-    public EventType getType() {
-        return type;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public Hashtable<String, String> getData() {
-        return data;
-    }
-
-    static Event fromHashMap(HashMap<String, Object> eventHashMap) {
-        final Integer typeIndex = ((Double) eventHashMap.get("type")).intValue();
-        final EventType type = EventType.valueOf(typeIndex);
-        String email = null;
-        if (eventHashMap.containsKey("email")) {
-            email = (String) eventHashMap.get("email");
-        }
-
-        Hashtable<String, String> data = null;
-        if (eventHashMap.containsKey("data")) {
-            final HashMap<String, String> dataHashMap = (HashMap<String, String>) eventHashMap.get("data");
-            data = new Hashtable<>();
-            for (Map.Entry<String, String> entry : dataHashMap.entrySet()) {
-                data.put(entry.getKey(), entry.getValue());
-            }
-        }
-
-        final Event event = new Event();
-        event.type = type;
-        event.email = email;
-        event.data = data;
-        return event;
-    }
-
-}

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

@@ -1,27 +0,0 @@
-package com.selligent;
-
-enum EventType {
-    UserRegister(90),
-    UserUnregister(91),
-    UserLogin(92),
-    UserLogout(93),
-    Custom(94);
-
-    private int index;
-
-    EventType(Integer index) {
-        this.index = index;
-    }
-
-    public static EventType valueOf(Integer index) {
-        EventType result = null;
-        for (EventType eventType: values()) {
-            if(index.equals(eventType.index)) {
-                result = eventType;
-            }
-        }
-
-        if (result == null) throw new IllegalArgumentException("Invalid eventType");
-        return result;
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.selligent;
-
-import android.content.Intent;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.selligent.sdk.SMManager;
-
-class GCMTokenBroadcastEventDataParser implements BroadcastEventDataParser {
-    @Override
-    public WritableMap parse(Intent intent) {
-        final String token = intent.getStringExtra(SMManager.BROADCAST_DATA_GCM_TOKEN);
-
-        return wrap(token);
-    }
-
-    public WritableMap wrap(String token) {
-        final WritableMap resultingMap = new WritableNativeMap();
-
-        resultingMap.putString("token", token);
-
-        return resultingMap;
-    }
-}

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

@@ -1,43 +0,0 @@
-package com.selligent;
-
-import android.content.Intent;
-
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeArray;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.selligent.sdk.SMInAppMessage;
-import com.selligent.sdk.SMManager;
-
-class InAppMessageBroadcastEventDataParser implements BroadcastEventDataParser {
-    @Override
-    public WritableMap parse(Intent intent) {
-        SMInAppMessage[] messages;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU)
-        {
-            messages = intent.getSerializableExtra(SMManager.BROADCAST_DATA_IN_APP_MESSAGES, SMInAppMessage[].class);
-        }
-        else
-        {
-            messages = (SMInAppMessage[])intent.getSerializableExtra(SMManager.BROADCAST_DATA_IN_APP_MESSAGES);
-        }
-
-        return wrap(messages);
-    }
-
-    public WritableMap wrap(SMInAppMessage[] messages)
-    {
-        final WritableMap resultingMap = new WritableNativeMap();
-
-        final WritableArray messageArray = new WritableNativeArray();
-        for (SMInAppMessage message : messages) {
-            WritableMap messageMap = new WritableNativeMap();
-            messageMap.putString("id", message.id);
-            messageMap.putString("title", message.title);
-            messageArray.pushMap(messageMap);
-        }
-        resultingMap.putArray("messages", messageArray);
-
-        return resultingMap;
-    }
-}

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

@@ -1,34 +0,0 @@
-package com.selligent;
-
-import com.selligent.sdk.SMInAppRefreshType;
-
-enum InAppMessageRefreshType {
-    NONE(10, SMInAppRefreshType.None),
-    MINUTELY(11, SMInAppRefreshType.Minutely),
-    HOURLY(12, SMInAppRefreshType.Hourly),
-    DAILY(13, SMInAppRefreshType.Daily);
-
-    private Integer index;
-    private SMInAppRefreshType smInAppRefreshType;
-
-    InAppMessageRefreshType(Integer index, SMInAppRefreshType smInAppRefreshType) {
-        this.index = index;
-        this.smInAppRefreshType = smInAppRefreshType;
-    }
-
-    public SMInAppRefreshType getSmInAppRefreshType() {
-        return smInAppRefreshType;
-    }
-
-    public static InAppMessageRefreshType valueOf(Integer index) {
-        InAppMessageRefreshType result = null;
-        for (InAppMessageRefreshType inAppMessageRefreshType: values()) {
-            if(index.equals(inAppMessageRefreshType.index)) {
-                result = inAppMessageRefreshType;
-            }
-        }
-
-        if (result == null) throw new IllegalArgumentException("Invalid inAppMessageRefreshType");
-        return result;
-    }
-}

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

@@ -1,19 +0,0 @@
-package com.selligent;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.selligent.sdk.SMNotificationMessage;
-
-class NotificationMessageBroadcastEventDataParser
-{
-    public WritableMap wrap(SMNotificationMessage message)
-    {
-        final WritableMap resultingMap = new WritableNativeMap();
-
-        resultingMap.putString("pushId", message.getId());
-        resultingMap.putString("name", message.getNotificationTitle());
-
-
-        return resultingMap;
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.selligent;
-
-import com.selligent.sdk.SMRemoteMessageDisplayType;
-
-enum RemoteMessageDisplayType {
-    AUTOMATIC(20, SMRemoteMessageDisplayType.Automatic),
-    NONE(21, SMRemoteMessageDisplayType.None),
-    NOTIFICATION(22, SMRemoteMessageDisplayType.Notification);
-
-    private Integer index;
-    private SMRemoteMessageDisplayType smRemoteMessageDisplayType;
-
-    RemoteMessageDisplayType(Integer index, SMRemoteMessageDisplayType smRemoteMessageDisplayType) {
-        this.index = index;
-        this.smRemoteMessageDisplayType = smRemoteMessageDisplayType;
-    }
-
-    public Integer getIndex() {
-        return index;
-    }
-
-    public SMRemoteMessageDisplayType getSmRemoteMessageDisplayType() {
-        return smRemoteMessageDisplayType;
-    }
-
-    public static RemoteMessageDisplayType valueOf(Integer index) {
-        RemoteMessageDisplayType result = null;
-        for (RemoteMessageDisplayType remoteMessageDisplayType : values()) {
-            if(index.equals(remoteMessageDisplayType.index)) {
-                result = remoteMessageDisplayType;
-            }
-        }
-
-        if (result == null) throw new IllegalArgumentException("Invalid remoteMessageDisplayType");
-        return result;
-    }
-
-    public static RemoteMessageDisplayType valueOf(SMRemoteMessageDisplayType smRemoteMessageDisplayType) {
-        RemoteMessageDisplayType result = null;
-        for (RemoteMessageDisplayType remoteMessageDisplayType : values()) {
-            if(smRemoteMessageDisplayType == remoteMessageDisplayType.smRemoteMessageDisplayType) {
-                result = remoteMessageDisplayType;
-            }
-        }
-
-        if (result == null) throw new IllegalArgumentException("Invalid SMRemoteMessageDisplayType");
-        return result;
-    }
-
-}

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

@@ -1,37 +0,0 @@
-package com.selligent;
-
-import com.selligent.sdk.SMCallback;
-import com.selligent.sdk.SMEvent;
-import com.selligent.sdk.SMEventUserLogin;
-import com.selligent.sdk.SMEventUserLogout;
-import com.selligent.sdk.SMEventUserRegister;
-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();
-        final String email = event.getEmail();
-        final Hashtable<String, String> data = event.getData();
-
-        switch (type) {
-            case UserRegister:
-                return new SMEventUserRegister(email, data, callback);
-            case UserUnregister:
-                return new SMEventUserUnregister(email, data, callback);
-            case UserLogin:
-                return new SMEventUserLogin(email, data, callback);
-            case UserLogout:
-                return new SMEventUserLogout(email, data, callback);
-            case Custom:
-                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,38 +0,0 @@
-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();
-        smSettings.WebServiceUrl = settings.getUrl();
-        smSettings.ClientId = settings.getClientId();
-        smSettings.PrivateKey = settings.getPrivateKey();
-        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();
-        smSettings.FrameworkType = SMFrameworkType.reactNative;
-
-        final ClearCacheIntervalValue clearCacheIntervalValue = settings.getClearCacheIntervalValue();
-        if (clearCacheIntervalValue != null) {
-            smSettings.ClearCacheIntervalValue = clearCacheIntervalValue.getSmClearCache();
-        }
-        final InAppMessageRefreshType inAppMessageRefreshType = settings.getInAppMessageRefreshType();
-        if (inAppMessageRefreshType != null) {
-            smSettings.InAppMessageRefreshType = inAppMessageRefreshType.getSmInAppRefreshType();
-        }
-        final RemoteMessageDisplayType remoteMessageDisplayType = settings.getRemoteMessageDisplayType();
-        if (remoteMessageDisplayType != null) {
-            smSettings.RemoteMessageDisplayType = remoteMessageDisplayType.getSmRemoteMessageDisplayType();
-        }
-        return smSettings;
-    }
-
-}

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

@@ -1,160 +0,0 @@
-package com.selligent;
-
-
-import java.util.Map;
-
-class Settings {
-
-    private String url;
-    private String clientId;
-    private String privateKey;
-    private String activityName;
-    private String notificationSmallIcon;
-    private String notificationLargeIcon;
-    private String notificationIconColor;
-    private boolean addInAppMessageFromPushToInAppMessageList = false;
-    private Boolean doNotFetchTheToken = false;
-    private Boolean doNotListenToThePush = false;
-    private Boolean loadCacheAsynchronously = false;
-    private ClearCacheIntervalValue clearCacheIntervalValue;
-    private InAppMessageRefreshType inAppMessageRefreshType = InAppMessageRefreshType.NONE;
-    private RemoteMessageDisplayType remoteMessageDisplayType;
-    private String notificationChannelId = "SMChannel001";
-    private String notificationChannelName = "SMDefaultChannel";
-    private String notificationChannelDescription = "";
-    private Boolean enableAndroidLogging = false;
-
-    private Settings() { }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public String getPrivateKey() {
-        return privateKey;
-    }
-
-    public String getActivityName() {
-        return activityName;
-    }
-
-    public String getNotificationSmallIcon() {
-        return notificationSmallIcon;
-    }
-
-    public String getNotificationLargeIcon() {
-        return notificationLargeIcon;
-    }
-
-    public String getNotificationIconColor() {
-        return notificationIconColor;
-    }
-
-    public Boolean getDoNotListenToThePush() { return doNotListenToThePush; }
-
-    public Boolean getAddInAppMessageFromPushToInAppMessageList() { return addInAppMessageFromPushToInAppMessageList; }
-
-    public Boolean getDoNotFetchTheToken() { return doNotFetchTheToken; }
-
-    public Boolean getLoadCacheAsynchronously() { return loadCacheAsynchronously; }
-
-    public ClearCacheIntervalValue getClearCacheIntervalValue() {
-        return clearCacheIntervalValue;
-    }
-
-    public InAppMessageRefreshType getInAppMessageRefreshType() {
-        return inAppMessageRefreshType;
-    }
-
-    public RemoteMessageDisplayType getRemoteMessageDisplayType() {
-        return remoteMessageDisplayType;
-    }
-
-    public String getNotificationChannelId() {
-        return notificationChannelId;
-    }
-
-    public String getNotificationChannelName() {
-        return notificationChannelName;
-    }
-
-    public String getNotificationChannelDescription() {
-        return notificationChannelDescription;
-    }
-
-    public Boolean getEnableAndroidLogging() { return enableAndroidLogging; }
-
-    public static Settings fromHashMap(Map<String, Object> settingsHashMap) {
-        final Settings settings = new Settings();
-
-        settings.url = (String) settingsHashMap.get("url");
-        settings.clientId = (String) settingsHashMap.get("clientId");
-        settings.privateKey = (String) settingsHashMap.get("privateKey");
-        settings.activityName = (String) settingsHashMap.get("fullyQualifiedNotificationActivityClassName");
-
-        if (settingsHashMap.containsKey("notificationSmallIcon")) {
-            settings.notificationSmallIcon = (String) settingsHashMap.get("notificationSmallIcon");
-        }
-
-        if (settingsHashMap.containsKey("notificationLargeIcon")) {
-            settings.notificationLargeIcon = (String) settingsHashMap.get("notificationLargeIcon");
-        }
-
-        if (settingsHashMap.containsKey("notificationIconColor")) {
-            settings.notificationIconColor = (String) settingsHashMap.get("notificationIconColor");
-        }
-
-        if (settingsHashMap.containsKey("addInAppMessageFromPushToInAppMessageList")) {
-            settings.addInAppMessageFromPushToInAppMessageList = (Boolean) settingsHashMap.get("addInAppMessageFromPushToInAppMessageList");
-        }
-
-        if (settingsHashMap.containsKey("doNotFetchTheToken")) {
-            settings.doNotFetchTheToken = (Boolean) settingsHashMap.get("doNotFetchTheToken");
-        }
-
-        if (settingsHashMap.containsKey("doNotListenToThePush")) {
-            settings.doNotListenToThePush = (Boolean) settingsHashMap.get("doNotListenToThePush");
-        }
-
-        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());
-        }
-
-        return settings;
-    }
-}