clevertap-react-native 3.2.0 → 3.4.0

package/android/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -0,0 +1,2 @@
+9
+0

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

@@ -0,0 +1,17 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/anush/clevertap/clevertap-react-native/Example/node_modules/clevertap-react-native/android/src/main/AndroidManifest.xml:1:1-8:12
+INJECTED from /Users/anush/clevertap/clevertap-react-native/Example/node_modules/clevertap-react-native/android/src/main/AndroidManifest.xml:1:1-8:12
+	package
+		ADDED from /Users/anush/clevertap/clevertap-react-native/Example/node_modules/clevertap-react-native/android/src/main/AndroidManifest.xml:1:11-40
+		INJECTED from /Users/anush/clevertap/clevertap-react-native/Example/node_modules/clevertap-react-native/android/src/main/AndroidManifest.xml
+application
+ADDED from /Users/anush/clevertap/clevertap-react-native/Example/node_modules/clevertap-react-native/android/src/main/AndroidManifest.xml:6:5-7:19
+uses-sdk
+INJECTED from /Users/anush/clevertap/clevertap-react-native/Example/node_modules/clevertap-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/anush/clevertap/clevertap-react-native/Example/node_modules/clevertap-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/anush/clevertap/clevertap-react-native/Example/node_modules/clevertap-react-native/android/src/main/AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from /Users/anush/clevertap/clevertap-react-native/Example/node_modules/clevertap-react-native/android/src/main/AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from /Users/anush/clevertap/clevertap-react-native/Example/node_modules/clevertap-react-native/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -30,13 +30,13 @@ buildscript {
 }
 
 android {
-    compileSdk 34
-    buildToolsVersion '34.0.0'
+    compileSdk 35
+    buildToolsVersion '35.0.0'
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 34
-        versionCode 320
-        versionName "3.2.0"
+        minSdkVersion 21
+        targetSdkVersion 35
+        versionCode 340
+        versionName "3.4.0"
         buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
     }
 
@@ -54,7 +54,7 @@ android {
 }
 
 dependencies {
-    api 'com.clevertap.android:clevertap-android-sdk:7.1.2'
+    api 'com.clevertap.android:clevertap-android-sdk:7.3.1'
     implementation 'com.android.installreferrer:installreferrer:2.2'
     //compile 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.facebook.react:react-native:+'

package/android/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Mar 05 15:18:18 IST 2024
+sdk.dir=/Users/anush/Library/Android/sdk

package/android/src/main/java/com/clevertap/react/CleverTapModuleImpl.java

@@ -2,9 +2,7 @@ package com.clevertap.react;
 
 import static com.clevertap.react.CleverTapUtils.convertObjectToWritableMap;
 import static com.clevertap.react.CleverTapUtils.getWritableArrayFromDisplayUnitList;
-import static com.clevertap.react.Constants.BPS;
 import static com.clevertap.react.Constants.FCM;
-import static com.clevertap.react.Constants.HPS;
 import static com.clevertap.react.Constants.REACT_MODULE_NAME;
 
 import android.annotation.SuppressLint;
@@ -32,6 +30,7 @@ import com.clevertap.android.sdk.inapp.customtemplates.CustomTemplateContext;
 import com.clevertap.android.sdk.inbox.CTInboxMessage;
 import com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;
 import com.clevertap.android.sdk.product_config.CTProductConfigController;
+import com.clevertap.android.sdk.pushnotification.PushType;
 import com.clevertap.android.sdk.usereventlogs.UserEventLog;
 import com.clevertap.android.sdk.variables.CTVariableUtils;
 import com.clevertap.android.sdk.variables.Var;
@@ -105,8 +104,6 @@ public class CleverTapModuleImpl {
             constants.put(event.getEventName(), event.getEventName());
         }
         constants.put(FCM, FCM);
-        constants.put(BPS, BPS);
-        constants.put(HPS, HPS);
         return constants;
     }
 
@@ -1084,28 +1081,26 @@ public class CleverTapModuleImpl {
         clevertap.setOptOut(value);
     }
 
-
-    public void setPushTokenAsString(String token, String type) {
-        Logger.v("setPushTokenAsString() called with: token = [" + token + "], type = [" + type + "]");
+    public void pushRegistrationToken(String token, ReadableMap type) {
+        Logger.v("pushRegistrationToken called with: token = [" + token + "], type = [" + type + "]");
         CleverTapAPI clevertap = getCleverTapAPI();
         if (clevertap == null || token == null || type == null) {
             return;
         }
 
-        switch (type) {
-            case FCM:
-                clevertap.pushFcmRegistrationId(token, true);
-                break;
-            case BPS:
-                clevertap.pushBaiduRegistrationId(token, true);
-                break;
-            case HPS:
-                clevertap.pushHuaweiRegistrationId(token, true);
-                break;
-            default:
-                Log.e(TAG, "Unknown push token type " + type);
-                break;
+        PushType pushType = pushTypeFromReadableMap(type);
+        if (pushType != null) {
+            clevertap.pushRegistrationToken(token, pushType, true);
+        }
+    }
+
+    public void setFCMPushTokenAsString(String token) {
+        Logger.v("setFCMPushTokenAsString called with: token = [" + token + "]");
+        CleverTapAPI clevertap = getCleverTapAPI();
+        if (clevertap == null || token == null) {
+            return;
         }
+        clevertap.pushFcmRegistrationId(token, true);
     }
 
     // Increment/Decrement Operator
@@ -1537,6 +1532,21 @@ public class CleverTapModuleImpl {
         return true;
     }
 
+    private PushType pushTypeFromReadableMap(ReadableMap readableMap) {
+        String type = readableMap.getString("type");
+        String prefKey =  readableMap.getString("prefKey");
+
+        if (type == null || prefKey == null) {
+            return null;
+        }
+
+        return new PushType(
+                type,
+                prefKey,
+                readableMap.getString("className"),
+                readableMap.getString("messagingSDKClassName"));
+    }
+
     @SuppressWarnings("SameParameterValue")
     private <T> HashMap<String, T> eventPropsFromReadableMap(ReadableMap propsMap, Class<T> tClass) {
         if (propsMap == null) {

package/android/src/main/java/com/clevertap/react/Constants.kt

@@ -10,6 +10,4 @@ object Constants {
     const val REACT_MODULE_NAME = "CleverTapReact"
 
     const val FCM = "FCM"
-    const val BPS = "BPS"
-    const val HPS = "HPS"
 }

package/android/src/newarch/CleverTapModule.kt

@@ -404,8 +404,12 @@ class CleverTapModule(reactContext: ReactApplicationContext?) :
         cleverTapModuleImpl.setOptOut(value)
     }
 
-    override fun setPushTokenAsString(token: String?, type: String?) {
-        cleverTapModuleImpl.setPushTokenAsString(token, type)
+    override fun pushRegistrationToken(token: String?, pushType: ReadableMap?) {
+        cleverTapModuleImpl.pushRegistrationToken(token, pushType)
+    }
+
+    override fun setFCMPushTokenAsString(token: String?) {
+        cleverTapModuleImpl.setFCMPushTokenAsString(token)
     }
 
     // Increment/Decrement Operator

package/android/src/oldarch/CleverTapModule.kt

@@ -477,8 +477,13 @@ class CleverTapModule(reactContext: ReactApplicationContext?) :
     }
 
     @ReactMethod
-    fun setPushTokenAsString(token: String?, type: String?) {
-        cleverTapModuleImpl.setPushTokenAsString(token, type)
+    fun pushRegistrationToken(token: String?, type: ReadableMap?) {
+        cleverTapModuleImpl.pushRegistrationToken(token, type)
+    }
+
+    @ReactMethod
+    fun setFCMPushTokenAsString(token: String?) {
+        cleverTapModuleImpl.setFCMPushTokenAsString(token)
     }
 
     // Increment/Decrement Operator

package/clevertap-react-native.podspec

@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
     s.dependency 'React-Core'
   end
 
-  s.dependency 'CleverTap-iOS-SDK', '7.1.0'
+  s.dependency 'CleverTap-iOS-SDK', '7.1.1'
 
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
     s.pod_target_xcconfig = {

package/docs/install.md

@@ -107,42 +107,6 @@ Clevertap ReactNative SDK supports `AndroidX Media3` from `v3.0.0+` to replace t
 |  `com.google.android.exoplayer:exoplayer-ui:2.19.1` | `androidx.media3:media3-ui:1.1.1`  |
 
 
-### Troubleshooting  
-
-If you face the following crash at runtime -
-
-```java.lang.UnsatisfiedLinkError: couldn't find DSO to load: libhermes.so```
-
-Add the following in your app/build.gradle -
-
-```
-project.ext.react = [
-    entryFile: "index.js",
-    enableHermes: false //add this
-]
-def jscFlavor = 'org.webkit:android-jsc:+'
-def enableHermes = project.ext.react.get("enableHermes", false);
-def jscFlavor = 'org.webkit:android-jsc:+'
-def enableHermes = project.ext.react.get("enableHermes", false);
-dependencies {
-if (enableHermes) {
-      // For RN 0.60.x
-      def hermesPath = "../../node_modules/hermesvm/android/"
-      debugImplementation files(hermesPath + "hermes-debug.aar")
-      releaseImplementation files(hermesPath + "hermes-release.aar")
-    } else {
-      implementation jscFlavor
-    }
-}
-```
-In android/build.gradle add this -
-
-```
-maven {
-        url "$rootDir/../node_modules/jsc-android/dist"
-      }
-```
-
 ## Manual Linking
 
 #### iOS:
@@ -167,4 +131,32 @@ dependencies {
 }
 ```
 
+### Troubleshooting
+#### Upgrading to clevertap-react-native v3.3.0
+
+To use `clevertap-react-native v3.3.0`, it is recommended to upgrade to **React Native v0.74+**.
+
+If you insist on using an older version of React Native, consider the following possible resolutions for common issues:
+
+##### For ReactNative v0.73
+**Error:** `Compiled with an incompatible version of Kotlin`
+
+**Resolution:** Force the Kotlin version in your root `build.gradle`:
+```gradle
+dependencies {
+  ....
+  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+
+  // NOTE: Do not place your application dependencies here; they belong
+  // in the individual module build.gradle files
+}
+```
+
+##### For ReactNative v0.71 or v0.72
+**Error:** `java.lang.NullPointerException: Cannot invoke "String.length()" because "<parameter1>" is null`
+
+**Reference:** https://issuetracker.google.com/issues/342522142
+
+**Resolution:** Either upgrade to `AGP 8.0.0+` or use a specific version of D8/R8 compiler as recommended in [this comment](https://issuetracker.google.com/issues/342522142#comment8) 
+
 Now move on to [integrating the SDK](./integration.md).

package/docs/usage.md

@@ -301,7 +301,25 @@ CleverTap.deleteNotificationChannelGroup(String groupId);
 #### Registering Fcm Token
 
 ```javascript 
-CleverTap.setPushToken("<Replace with FCM Token value>", CleverTap.FCM);
+CleverTap.setFCMPushToken("<Replace with FCM Token value>");
+```
+
+#### Registering HPS/Baidu token
+
+```javascript 
+CleverTap.pushRegistrationToken("my_hms_token", {
+  type: 'hps',
+  prefKey: 'hps_token',
+  className: 'com.clevertap.android.hms.HmsPushProvider',
+  messagingSDKClassName: 'com.huawei.hms.push.HmsMessageService'
+});
+
+CleverTap.pushRegistrationToken("my_bps_token", {
+  type: 'bps',
+  prefKey: 'bps_token',
+  className: 'com.clevertap.android.bps.BaiduPushProvider',
+  messagingSDKClassName: 'com.baidu.android.pushservice.PushMessageReceiver'
+});
 ```
 
 -----------

package/ios/CleverTapReact/CleverTapReact.mm

@@ -164,12 +164,20 @@ RCT_EXPORT_METHOD(registerForPush) {
     }
 }
 
-RCT_EXPORT_METHOD(setPushTokenAsString:(NSString*)token withType:(NSString *)type) {
-    // type is a no-op in iOS
+RCT_EXPORT_METHOD(setFCMPushTokenAsString:(NSString*)token) {
     RCTLogInfo(@"[CleverTap setPushTokenAsString: %@]", token);
     [[self cleverTapInstance] setPushTokenAsString:token];
 }
 
+RCT_EXPORT_METHOD(pushRegistrationToken:(NSString*)token withPushType:(NSDictionary*)pushType) {
+    NSString *type = pushType[@"type"];
+    if ([type isEqualToString:@"fcm"]) {
+        [self setFCMPushTokenAsString:token];
+    } else {
+        RCTLogInfo(@"[CleverTap pushRegistrationToken for types other than FCM is no-op in iOS]");
+    }
+}
+
 // setPushTokenAsStringWithRegion is a no-op in iOS
 RCT_EXPORT_METHOD(setPushTokenAsStringWithRegion:(NSString*)token withType:(NSString *)type withRegion:(NSString *)region){
     RCTLogInfo(@"[CleverTap setPushTokenAsStringWithRegion is no-op in iOS]");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clevertap-react-native",
-  "version": "3.2.0",
+  "version": "3.4.0",
   "description": "CleverTap React Native SDK.",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/NativeCleverTapModule.ts

@@ -28,9 +28,7 @@ export interface Spec extends TurboModule {
     CleverTapOnVariablesChangedAndNoDownloadsPending: string;
     CleverTapOnceVariablesChangedAndNoDownloadsPending: string;
     CleverTapOnFileValueChanged: string;
-    HPS: string;
     FCM: string;
-    BPS: string;
   };
   
   setInstanceWithAccountId(accountId: string): void;
@@ -38,7 +36,8 @@ export interface Spec extends TurboModule {
   setLibrary(name: string, andVersion: number): void;
   setLocale(locale: string): void;
   registerForPush(): void;
-  setPushTokenAsString(token: string, withType: string): void;
+  setFCMPushTokenAsString(token: string): void;
+  pushRegistrationToken(token: string, pushType: Object | null): void;
   setPushTokenAsStringWithRegion(token: string, withType: string, withRegion: string): void;
   enablePersonalization(): void;
   disablePersonalization(): void;

package/src/index.d.ts

@@ -69,11 +69,17 @@
   export function registerForPush(): void;
 
   /**
-   * Manually set the push token on the CleverTap user profile
+   * Manually set the FCM push token on the CleverTap user profile
    * @param {string} token - the device token
-   * @param {string} type - for Android only, specifying the type of push service token. Values can be CleverTap.FCM for Firebase or CleverTap.BPS for Baidu or CleverTap.HPS for Huawei,
    */
-  export function setPushToken(token: string, type: string): void;
+  export function setFCMPushToken(token: string): void;
+
+    /**
+     * Manually set the push token on the CleverTap user profile for providers other than FCM
+     * @param {string} token - the device token
+     * @param {any} type - object with the following keys "type", "prefKey", "className", "messagingSDKClassName";
+     */
+    export function pushRegistrationToken(token: string, pushType: any): void;
 
   /**
    * Create Notification Channel for Android O+
@@ -963,8 +969,6 @@ export function isPushPermissionGranted(callback: CallbackString): void;
   type CallbackString = (err: object, res: string) => void;
 
   export const FCM: string;
-  export const BPS: string;
-  export const HPS: string;
   export const CleverTapProfileDidInitialize: string;
   export const CleverTapProfileSync: string;
   export const CleverTapInAppNotificationDismissed: string;

package/src/index.js

@@ -12,7 +12,7 @@ const EventEmitter = Platform.select({
 * @param {int} libVersion - The updated library version. If current version is 1.1.0 then pass as 10100  
 */
 const libName = 'React-Native';
-const libVersion = 30200;
+const libVersion = 30400;
 CleverTapReact.setLibrary(libName,libVersion);
 
 function defaultCallback(method, err, res) {
@@ -55,8 +55,6 @@ var CleverTap = {
     CleverTapCustomFunctionPresent: CleverTapReact.getConstants().CleverTapCustomFunctionPresent,
     CleverTapCustomTemplateClose: CleverTapReact.getConstants().CleverTapCustomTemplateClose,
     FCM: CleverTapReact.getConstants().FCM,
-    BPS: CleverTapReact.getConstants().BPS,
-    HPS: CleverTapReact.getConstants().HPS,
     CleverTapInboxDidInitialize: CleverTapReact.getConstants().CleverTapInboxDidInitialize,
     CleverTapInboxMessagesDidUpdate: CleverTapReact.getConstants().CleverTapInboxMessagesDidUpdate,
     CleverTapInboxMessageButtonTapped: CleverTapReact.getConstants().CleverTapInboxMessageButtonTapped,
@@ -147,11 +145,20 @@ var CleverTap = {
     /**
      * Manually set the push token on the CleverTap user profile
      * @param {string} token - the device token
-     * @param {string} type - for Android only, specifying the type of push service token. Values can be CleverTap.FCM for Firebase or CleverTap.BPS for Baidu or CleverTap.HPS for Huawei,
+     * @param {object} pushType - object with the following keys "type", "prefKey", "className", "messagingSDKClassName";
      */
-    setPushToken: function (token, type) {
-        console.log(`CleverTap RN | setPushToken | received : token: '${token}' | type:'${type}' `)
-        CleverTapReact.setPushTokenAsString(token, type);
+    pushRegistrationToken: function (token, pushType) {
+        console.log(`CleverTap RN | pushRegistrationToken| received : token: '${token}'`)
+        CleverTapReact.pushRegistrationToken(token, pushType);
+    },
+
+    /**
+     * Manually set the push token on the CleverTap user profile
+     * @param {string} token - the fcm device token
+     */
+    setFCMPushToken: function (token) {
+        console.log(`CleverTap RN | setFCMPushToken | received : token: '${token}'`)
+        CleverTapReact.setFCMPushTokenAsString(token);
     },
 
     /**

package/android/.gradle/nb-cache/trust/78DD44AAC81C568A008B13ED64740D37310990B04E1F70028E68455541C79400

@@ -1 +0,0 @@
-DCC73873EEDDA3B877B3B1661F94F060C0B645A5A1CEFC1A3367BF88075D1DE9

package/ios/CleverTapReact.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

package/ios/CleverTapReact.xcodeproj/xcuserdata/kushagra.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>CleverTapReact.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>