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

package/README.md

@@ -2,21 +2,21 @@
 
 This module provides an API for the usage of the Selligent Mobile SDKs in React Native.
 
-# SelligentMobileSDK-ReactNative Integration
+## SelligentMobileSDK-ReactNative Integration
+
 This module uses the native Selligent SDKs:
 
 | SDK                                                                     | Version |
 | ----------------------------------------------------------------------- | ------- |
-| [Android](https://github.com/SelligentMarketingCloud/MobileSDK-Android) | 4.1.0  |
-| [iOS](https://github.com/SelligentMarketingCloud/MobileSDK-iOS)         | 3.4.0   |
-
+| [Android](https://github.com/SelligentMarketingCloud/MobileSDK-Android) | 4.3.0   |
+| [iOS](https://github.com/SelligentMarketingCloud/MobileSDK-iOS)         | 3.6.0   |
 
 > **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.
-
 > **IMPORTANT** Since version 2.10.0 of this module, we support React Native v0.70, but NOT 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.
 
 ## Installation
-> Please refer to our <a href="documentation/#reactnative--using-the-sdk">SDK full documentation</a> for a step-by-step guide on how to use the SDK, after installation.
+
+> Please refer to our [SDK full documentation](documentation/#reactnative--using-the-sdk) for a step-by-step guide on how to use the SDK, after installation.
 
 1. Install the module
 
@@ -36,7 +36,7 @@ This module uses the native Selligent SDKs:
    }
    ```
 
-> Check all the options that can be used in our <a href="documentation/#selligent_json">SDK full documentation</a>
+> Check all the options that can be used in our [SDK full documentation](documentation/#working-with-the-selligentjson)
 
 ### Android Specific Installation
 
@@ -91,7 +91,7 @@ This module uses the native Selligent SDKs:
    project(':selligent-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/@selligent-marketing-cloud/selligent-react-native/android')
    ```
 
-3. Add the following in the `android/build.gradle` file, and make sure the the the Gradle version in `android/gradle/wrapper/gradle-wrapper.properties` is >= 6.7.1:
+3. Add the following in the `android/build.gradle` file, and make sure that the Gradle version in `android/gradle/wrapper/gradle-wrapper.properties` is >= 6.7.1:
 
    ```groovy
    // android/build.gradle
@@ -153,63 +153,49 @@ This module uses the native Selligent SDKs:
    ```
 
 </details>
-<br>
+
 <details open>
 <summary>With autolinking (RN 0.60 and above)</summary>
 
 1. Create a Google application following the section **Creating a Google application** of the **Android - Using the SDK** pdf, and place the `google-services.json` file in the `./android/app` folder.
 
-2. Add the following lines at the end of the `android/settings.gradle` file:
-
-   ```groovy
-   include ':selligent-react-native'
-   project(':selligent-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/@selligent-marketing-cloud/selligent-react-native/android')
-   ```
-
-3. Add the following in the `android/build.gradle` file, and make sure the the the Gradle version in `android/gradle/wrapper/gradle-wrapper.properties` is >= 6.7.1:
+2. Add the following in the `android/build.gradle` file, and make sure that the Gradle version in `android/gradle/wrapper/gradle-wrapper.properties` is >= 6.7.1:
 
    ```groovy
    // android/build.gradle 
 
    buildscript {
        dependencies {
-           // Make sure your Gradle plugin version is >= 4.2.0
-           classpath("com.android.tools.build:gradle:4.2.0")
            // Add the following:
            classpath 'com.google.gms:google-services:4.3.3'
        }
    }
    ```
 
-   ```groovy
-    // android/gradle/wrapper/gradle-wrapper.properties
-    distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
-   ```
-
-4. Add the following in the `android/app/build.gradle` file:
+3. Add the following in the `android/app/build.gradle` file (at the bottom):
 
    ```groovy
    // Add the following:
    apply plugin: 'com.google.gms.google-services'
    ```
 
-5. Add the following in the `android/app/src/../MainApplication.java` file:
+4. Add the following in the `android/app/src/../MainApplication.java` file:
 
-   ```java
-   // Add the following import statements:
-   import com.selligent.RNSelligent;
-   import com.selligent.RNSelligentPackage;
+    ```java
+    // Add the following import statements:
+    import com.selligent.RNSelligent;
+    import com.selligent.RNSelligentPackage;
 
-   public class MainApplication extends Application implements ReactApplication {
-       @Override
-       public void onCreate() {
-           super.onCreate();
+    public class MainApplication extends Application implements ReactApplication {
+        @Override
+        public void onCreate() {
+            super.onCreate();
 
-           // Add the following:
-           RNSelligent.configure(this);
-       }
-   }
-   ```
+            // Add the following:
+            RNSelligent.configure(this);
+        }
+    }
+    ```
 
 </details>
 
@@ -224,7 +210,7 @@ This module uses the native Selligent SDKs:
 
     > 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.4.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**.
+3. Add the native iOS SDK dependency in your Podfile: `s.dependency "SelligentMobileSDK/Framework", "3.6.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
 
@@ -245,7 +231,7 @@ This module uses the native Selligent SDKs:
     ```
 
 </details>
-<br>
+
 <details open>
 <summary>With autolinking (RN 0.60 and above)</summary>
 
@@ -266,4 +252,4 @@ This module uses the native Selligent SDKs:
     [RNSelligent configureWithLaunchOptions:launchOptions];
     ```
 
-</details>
+</details>

package/RNSelligentMapper.podspec

@@ -0,0 +1,22 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name          = "RNSelligentMapper"
+  s.authors       = package['author']
+  s.version       = package["version"]
+  s.summary       = package["description"]
+  s.description   = "React Native wrapper mapper for the Selligent Marketing Cloud Android and iOS SDKs"
+  s.homepage      = package['homepage']
+  s.license       = "MIT"
+  s.platform      = :ios, "12.0"
+  s.source        = { :git => "https://github.com/SelligentMarketingCloud/MobileSDK-ReactNative.git", :tag => "v" + s.version.to_s }
+  s.swift_version = "5.0"
+  
+  s.source_files  = "ios/*.{h,m}"
+  
+  s.dependency "React-Core"
+  s.dependency "RNSelligent"
+end
+	

package/android/build.gradle

@@ -1,8 +1,6 @@
 import com.android.build.api.variant.BuildConfigField
 import java.util.regex.*
 
-apply plugin: 'com.android.library'
-
 buildscript {
     repositories {
         google()
@@ -14,6 +12,9 @@ buildscript {
     }
 }
 
+apply plugin: 'com.android.library'
+
+
 android {
     compileSdkVersion 33
 
@@ -44,6 +45,7 @@ repositories {
         url "$projectDir/../node_modules/react-native/android"
     }
     google()
+    maven { url 'https://developer.huawei.com/repo/' }
 }
 
 dependencies {
@@ -51,7 +53,7 @@ dependencies {
         exclude group:'com.facebook.fbjni'
         exclude group:'com.facebook.yoga'
     }
-    implementation 'com.selligent.sdk:selligent_mobile_sdk:4.1.0'
+    implementation 'com.selligent.sdk:selligent_mobile_sdk:4.3.0'
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'com.google.firebase:firebase-messaging:23.0.8'
     implementation 'androidx.work:work-runtime:2.8.1'
@@ -110,4 +112,4 @@ def getCurrentFlavor() {
     else {
         return ""
     }
-}
+}

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

@@ -10,12 +10,18 @@ import java.util.HashMap;
 import java.util.Map;
 
 class BroadcastDataFactory {
+    private BroadcastDataFactory(){}
 
-    private static Map<String, BroadcastEventDataParser> broadcastDataParserMap = new HashMap<String, BroadcastEventDataParser>() {{
-        put(SMManager.BROADCAST_EVENT_RECEIVED_IN_APP_MESSAGE, new InAppMessageBroadcastEventDataParser());
-        put(SMManager.BROADCAST_EVENT_BUTTON_CLICKED, new ButtonBroadcastEventDataParser());
-        put(SMManager.BROADCAST_EVENT_RECEIVED_GCM_TOKEN, new GCMTokenBroadcastEventDataParser());
-    }};
+    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();
@@ -27,7 +33,7 @@ class BroadcastDataFactory {
         }
         broadcastData.putString("broadcastEventType", resultingBroadcastEventType);
 
-        final BroadcastEventDataParser broadcastEventDataParser = broadcastDataParserMap.get(smBroadcastEventType);
+        final BroadcastEventDataParser broadcastEventDataParser = getBroadcastDataParserMap().get(smBroadcastEventType);
 
         if (broadcastEventDataParser != null) {
             final WritableMap resultingData = broadcastEventDataParser.parse(intent);

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

@@ -43,8 +43,9 @@ public enum ButtonAction
         return deeplink;
       case 113:
         return simple;
+      default:
+        return unknown;
     }
-    return unknown;
   }
 
   public static ButtonAction valueOf(SMLinkAction linkAction)

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

@@ -10,7 +10,15 @@ import com.selligent.sdk.SMNotificationButton;
 class ButtonBroadcastEventDataParser implements BroadcastEventDataParser {
     @Override
     public WritableMap parse(Intent intent) {
-        SMNotificationButton button = (SMNotificationButton)intent.getSerializableExtra(SMManager.BROADCAST_DATA_BUTTON);
+        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);
     }

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

@@ -2,6 +2,7 @@ package com.selligent;
 
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.Map;
 
 class Event {
 
@@ -35,9 +36,8 @@ class Event {
         if (eventHashMap.containsKey("data")) {
             final HashMap<String, String> dataHashMap = (HashMap<String, String>) eventHashMap.get("data");
             data = new Hashtable<>();
-            for (String key : dataHashMap.keySet()) {
-                final String value = dataHashMap.get(key);
-                data.put(key, value);
+            for (Map.Entry<String, String> entry : dataHashMap.entrySet()) {
+                data.put(entry.getKey(), entry.getValue());
             }
         }
 

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

@@ -12,7 +12,15 @@ import com.selligent.sdk.SMManager;
 class InAppMessageBroadcastEventDataParser implements BroadcastEventDataParser {
     @Override
     public WritableMap parse(Intent intent) {
-        SMInAppMessage[] messages = (SMInAppMessage[])intent.getSerializableExtra(SMManager.BROADCAST_DATA_IN_APP_MESSAGES);
+        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);
     }