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

package/RNSelligent.podspec

@@ -4,25 +4,18 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 Pod::Spec.new do |s|
   s.name         = "RNSelligent"
-  s.authors      = { 'AppFoundry' => 'info@appfoundry.be' }
+  s.authors      = package['author']
   s.version      = package["version"]
   s.summary      = package["description"]
-  s.description  = <<-DESC
-                  RNSelligent
-                   DESC
-  s.homepage     = "https://github.com/SelligentMarketingCloud/MobileSDK-ReactNative"
+  s.description  = "React Native wrapper for the Selligent Marketing Cloud Android and iOS SDKs"
+  s.homepage     = package['homepage']
   s.license      = "MIT"
   s.platform     = :ios, "11.0"
   s.source       = { :git => "https://github.com/SelligentMarketingCloud/MobileSDK-ReactNative.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m}"
-  s.requires_arc = true
-
-  s.vendored_libraries = "ios/libSelligentMobile.a"
-  s.libraries = "SelligentMobile"
-
-  s.dependency "React"
-  s.dependency "PlotPlugin"
-end
-
+  s.vendored_frameworks = "ios/RNSelligentMobileSDK.xcframework"
+  s.source_files = "ios/*.{h,m}"
   
+  s.dependency "React-Core"
+  s.dependency "SelligentMobileSDK/Framework", "3.4.0"
+end

package/android/build.gradle

@@ -1,7 +1,7 @@
 import com.android.build.api.variant.BuildConfigField
+import java.util.regex.*
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
 
 buildscript {
     repositories {
@@ -10,48 +10,28 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
-    }
-}
-
-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")
-        }
+        classpath 'com.android.tools.build:gradle:4.2.2'
     }
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 32
-        ndkVersion = "21.4.7075529"
-        versionCode 1
-        versionName "1.0"
-    }
-
-    lintOptions {
-        abortOnError false
+        targetSdkVersion 33
     }
 }
 
 androidComponents {
     onVariants(selector(), { variant ->
         def selligentSettings = loadSelligentSettings(variant)
+
         if (selligentSettings != null) {
             try {
                 variant.buildConfigFields.put("SELLIGENT_SETTINGS", new BuildConfigField("String", "\"" + selligentSettings + "\"", "Selligent settings"))
-            } catch (MissingMethodException ignored) {
+            }
+            catch (Exception ignored) {
                 throw new Exception("Selligent requires Android Gradle plugin version 4.2.0 or higher.")
             }
         }
@@ -59,88 +39,75 @@ androidComponents {
 }
 
 repositories {
+    mavenCentral()
     maven {
         url "$projectDir/../node_modules/react-native/android"
     }
-    mavenCentral()
+    google()
 }
 
 dependencies {
-    implementation(name: 'sdk-release', ext: 'aar')
-
-    implementation 'com.facebook.react:react-native:+'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    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.7.1'
+    api ('com.facebook.react:react-native:+') {
+        exclude group:'com.facebook.fbjni'
+        exclude group:'com.facebook.yoga'
+    }
+    implementation 'com.selligent.sdk:selligent_mobile_sdk:4.1.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'
     implementation 'androidx.concurrent:concurrent-futures:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-}
-
-afterEvaluate { project ->
-
-    task androidJavadoc(type: Javadoc) {
-        source = android.sourceSets.main.java.srcDirs
-        classpath += files(android.bootClasspath)
-        project.getConfigurations().getByName('implementation').setCanBeResolved(true)
-        classpath += files(project.getConfigurations().getByName('implementation').asList())
-        include '**/*.java'
-    }
-
-    task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        archiveClassifier = 'javadoc'
-        from androidJavadoc.destinationDir
-    }
-
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
-    }
-
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        task "jar${name}"(type: Jar, dependsOn: variant.javaCompileProvider.get()) {
-            from variant.javaCompileProvider.get().destinationDir
-        }
-    }
-
-    publishing {
-        publications {
-            maven(MavenPublication) {
-                artifact androidSourcesJar
-                artifact androidJavadocJar
-            }
-        }
-    }
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
 }
 
 def loadSelligentSettings(variant) {
-    println(variant.flavorName)
-
+    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");
+    File variantFile = new File("$project.rootDir/../$variantSelligentFileName")
 
     def resultingSettings = null
+
     if (variantFile.exists()) {
         println("Reading Selligent properties for variant ${variant.getName()} using $variantSelligentFileName")
         resultingSettings = ""
+
         variantFile.eachLine { String line ->
             resultingSettings += line.replace("\"", "\\\"").replaceAll("\\s", "")
         }
-    } else if (defaultFile.exists()) {
-        println("Reading Selligent properties from default $defaultSelligentFileName (no variant specific $variantSelligentFileName was found)")
+    }
+    else if (defaultFile.exists()) {
+        println("Reading Selligent properties from default ${defaultFile.name} (no variant specific $variantSelligentFileName was found)")
         resultingSettings = ""
+
         defaultFile.eachLine { String line ->
             resultingSettings += line.replace("\"", "\\\"").replaceAll("\\s", "")
         }
-    } else {
+    }
+    else {
         throw new InvalidUserDataException("The selligent.json file could not be found. Please make sure you provide this file in the root of this project.")
     }
 
     return resultingSettings
-}
+}
+
+def getCurrentFlavor() {
+    Gradle gradle = getGradle()
+    String tskReqStr = gradle.getStartParameter().getTaskRequests().toString()
+    Pattern pattern = Pattern.compile("(install|assemble)(\\w+)(Release|Debug)")
+    Matcher matcher = pattern.matcher(tskReqStr)
+
+    if (matcher.find()) {
+        return matcher.group(2).toLowerCase()
+    }
+    else {
+        return ""
+    }
+}

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

@@ -7,7 +7,10 @@ enum BroadcastEventType {
     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);
+    ReceivedGCMToken("ReceivedGCMToken", SMManager.BROADCAST_EVENT_RECEIVED_GCM_TOKEN),
+    ReceivedNotification("ReceivedRemoteNotification", null),
+    ReceivedDeviceId("ReceivedDeviceId", null),
+    TriggeredCustomEvent("TriggeredCustomEvent", null);
 
     private String broadcastEventType;
     private String smBroadcastEventType;

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

@@ -0,0 +1,81 @@
+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;
+    }
+    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

@@ -10,14 +10,20 @@ import com.selligent.sdk.SMNotificationButton;
 class ButtonBroadcastEventDataParser implements BroadcastEventDataParser {
     @Override
     public WritableMap parse(Intent intent) {
+        SMNotificationButton button = (SMNotificationButton)intent.getSerializableExtra(SMManager.BROADCAST_DATA_BUTTON);
+
+        return wrap(button);
+    }
+
+    public WritableMap wrap(SMNotificationButton button)
+    {
         final WritableMap resultingMap = new WritableNativeMap();
 
-        SMNotificationButton button = (SMNotificationButton)intent.getSerializableExtra(SMManager.BROADCAST_DATA_BUTTON);
         resultingMap.putString("id", button.id);
-        resultingMap.putInt("type", button.type);
+        resultingMap.putInt("type", ButtonAction.valueOf(button.action).getValue());
         resultingMap.putString("value", button.value);
         resultingMap.putString("label", button.label);
-        resultingMap.putInt("action", button.action.getValue());
+
         if (button.data != null) {
             final WritableMap buttonData = new WritableNativeMap();
             for(String dataKey : button.data.keySet()) {

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

@@ -0,0 +1,15 @@
+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/EventType.java

@@ -7,7 +7,7 @@ enum EventType {
     UserLogout(93),
     Custom(94);
 
-    private Integer index;
+    private int index;
 
     EventType(Integer index) {
         this.index = index;

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

@@ -9,9 +9,14 @@ 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();
 
-        final String token = intent.getStringExtra(SMManager.BROADCAST_DATA_GCM_TOKEN);
         resultingMap.putString("token", token);
 
         return resultingMap;

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

@@ -12,9 +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);
+
+        return wrap(messages);
+    }
+
+    public WritableMap wrap(SMInAppMessage[] messages)
+    {
         final WritableMap resultingMap = new WritableNativeMap();
 
-        SMInAppMessage[] messages = (SMInAppMessage[])intent.getSerializableExtra(SMManager.BROADCAST_DATA_IN_APP_MESSAGES);
         final WritableArray messageArray = new WritableNativeArray();
         for (SMInAppMessage message : messages) {
             WritableMap messageMap = new WritableNativeMap();

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

@@ -0,0 +1,19 @@
+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;
+    }
+}