clevertap-react-native 1.2.1 → 2.1.0

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

@@ -0,0 +1,16 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+	package
+		INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml
+application
+ADDED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml:2:5-3:19
+uses-sdk
+INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml

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

@@ -0,0 +1,16 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+	package
+		INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml
+application
+ADDED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml:2:5-3:19
+uses-sdk
+INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from /Users/anush/clevertap/clevertap-react-native/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -8,22 +8,23 @@ buildscript {
             name 'Google'
         }
     }
-
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:8.2.2'
     }
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion '33.0.0'
+    compileSdkVersion 34
+    buildToolsVersion '34.0.0'
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 33
-        versionCode 121
-        versionName "1.2.1"
+        targetSdkVersion 34
+        versionCode 210
+        versionName "2.1.0"
     }
+
+    namespace 'com.clevertap.react'
     buildTypes {
         release {
             minifyEnabled false
@@ -39,7 +40,7 @@ dependencies {
         maven { url "$rootDir/../node_modules/react-native/android" }
     }
 
-    api 'com.clevertap.android:clevertap-android-sdk:5.2.1'
+    api 'com.clevertap.android:clevertap-android-sdk:6.1.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/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Oct 06 22:41:12 IST 2020
+#Tue Mar 05 15:25:40 IST 2024
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME

package/android/gradle.properties

@@ -1 +1,2 @@
-android.useAndroidX=true
+android.useAndroidX=true
+android.enableJetifier=true

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/AndroidManifest.xml

@@ -1,5 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.clevertap.react">
+    xmlns:tools="http://schemas.android.com/tools">
     <application>
+        <service
+            android:name="com.clevertap.android.sdk.pushnotification.amp.CTBackgroundJobService"
+            android:enabled="false"
+            android:exported="false"
+            tools:ignore="MissingClass" />
     </application>
 </manifest>

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

@@ -41,6 +41,7 @@ import com.clevertap.android.sdk.variables.Var;
 import com.clevertap.android.sdk.variables.callbacks.FetchVariablesCallback;
 import com.clevertap.android.sdk.variables.callbacks.VariableCallback;
 import com.clevertap.android.sdk.variables.callbacks.VariablesChangedCallback;
+import com.clevertap.android.sdk.inapp.callbacks.FetchInAppsCallback;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -1547,6 +1548,30 @@ public class CleverTapModule extends ReactContextBaseJavaModule implements SyncL
         }
     }
 
+    @ReactMethod
+    public void clearInAppResources(final boolean expiredOnly) {
+        CleverTapAPI cleverTap = getCleverTapAPI();
+        if (cleverTap != null) {
+            cleverTap.clearInAppResources(expiredOnly);
+        }
+    }
+
+    @ReactMethod
+    public void fetchInApps(final Callback callback) {
+        CleverTapAPI cleverTap = getCleverTapAPI();
+        if (cleverTap != null) {
+            cleverTap.fetchInApps(new FetchInAppsCallback() {
+                @Override
+                public void onInAppsFetched(final boolean isSuccess) {
+                    callbackWithErrorAndResult(callback, null, isSuccess);
+                }
+            });
+        } else {
+            String error = ErrorMessages.CLEVERTAP_NOT_INITIALIZED.getErrorMessage();
+            callbackWithErrorAndResult(callback, error, null);
+        }
+    }
+
     /************************************************
      *  Product Experience Remote Config methods ends
      ************************************************/

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

@@ -79,6 +79,8 @@ public class CleverTapUtils {
                     writableMap.putInt(key, (Integer) value);
                 } else if (value instanceof Boolean) {
                     writableMap.putBoolean(key, (Boolean) value);
+                } else if (value instanceof Long) {
+                    writableMap.putDouble(key, ((Long) value).doubleValue());
                 } else if (value instanceof Float || value instanceof Double) {
                     writableMap.putDouble(key, Double.parseDouble(value.toString()));
                 } else if (value instanceof JSONObject) {
@@ -109,6 +111,8 @@ public class CleverTapUtils {
                     writableArray.pushInt((Integer) value);
                 } else if (value instanceof Boolean) {
                     writableArray.pushBoolean((Boolean) value);
+                } else if (value instanceof Long) {
+                    writableArray.pushDouble(((Long) value).doubleValue());
                 } else if (value instanceof Float || value instanceof Double) {
                     writableArray.pushDouble(Double.parseDouble(value.toString()));
                 } else if (value instanceof JSONObject) {

package/clevertap-react-native.podspec

@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
   s.preserve_paths = 'LICENSE.md', 'README.md', 'package.json', 'index.js'
   s.source_files   = 'ios/CleverTapReact/*.{h,m}'
 
-  s.dependency 'CleverTap-iOS-SDK', '5.2.1'
+  s.dependency 'CleverTap-iOS-SDK', '6.1.0'
   s.dependency 'React-Core'
 end

package/index.d.ts

@@ -756,6 +756,21 @@ export function isPushPermissionGranted(callback: CallbackString): void;
     */
   export function onValueChanged(name: string, handler: Function): void;
 
+
+  /**
+   * Fetches In Apps from server.
+   *
+   * @param {function(err, res)} callback a callback with a boolean flag whether the fetching was successful
+   */
+  export function fetchInApps(callback: Callback): void;
+
+  /**
+   * Deletes all images and gifs which are preloaded for inapps in cs mode
+   *
+   * @param {boolean} expiredOnly to clear only assets which will not be needed further for inapps
+   */
+  export function clearInAppResources(expiredOnly: boolean): void;
+
   /*******************
    * Developer Options
    ******************/

package/index.js

@@ -9,7 +9,7 @@ const EventEmitter = NativeModules.CleverTapReactEventEmitter ? new NativeEventE
 * @param {int} libVersion - The updated library version. If current version is 1.1.0 then pass as 10100  
 */
 const libName = 'React-Native';
-const libVersion = 10201; 
+const libVersion = 20100; 
 CleverTapReact.setLibrary(libName,libVersion);
 
 function defaultCallback(method, err, res) {
@@ -949,6 +949,24 @@ var CleverTap = {
     onValueChanged: function (name, handler) {
         CleverTapReact.onValueChanged(name);
         this.addListener(CleverTapReact.CleverTapOnValueChanged, handler);
+    },
+
+    /**
+     * Fetches In Apps from server.
+     *
+     * @param callback {function(err, res)} a callback with a boolean flag whether the update was successful
+     */
+    fetchInApps: function (callback) {
+        callWithCallback('fetchInApps', null, callback);
+    },
+
+    /**
+     * Deletes all images and gifs which are preloaded for inapps in cs mode
+     *
+     * @param {boolean} expiredOnly to clear only assets which will not be needed further for inapps
+     */
+    clearInAppResources: function(expiredOnly) {
+        CleverTapReact.clearInAppResources(expiredOnly);
     }
 };
 

package/ios/CleverTapReact/CleverTapReact.m

@@ -634,11 +634,16 @@ RCT_EXPORT_METHOD(initializeInbox) {
 
 RCT_EXPORT_METHOD(showInbox:(NSDictionary*)styleConfig) {
     RCTLogInfo(@"[CleverTap Show Inbox]");
+    UIWindow *keyWindow = [[UIApplication sharedApplication] keyWindow];
+    UIViewController *mainViewController = keyWindow.rootViewController;
+    if (mainViewController.presentedViewController) {
+        RCTLogInfo(@"CleverTap : Could not present App Inbox because a view controller is already being presented.");
+        return;
+    }
+    
     CleverTapInboxViewController *inboxController = [[self cleverTapInstance] newInboxViewControllerWithConfig:[self _dictToInboxStyleConfig:styleConfig? styleConfig : nil] andDelegate:(id <CleverTapInboxViewControllerDelegate>)self];
     if (inboxController) {
         UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:inboxController];
-        UIWindow *keyWindow = [[UIApplication sharedApplication] keyWindow];
-        UIViewController *mainViewController = keyWindow.rootViewController;
         [mainViewController presentViewController:navigationController animated:YES completion:nil];
     }
 }
@@ -852,6 +857,20 @@ RCT_EXPORT_METHOD(resumeInAppNotifications) {
     [[self cleverTapInstance] resumeInAppNotifications];
 }
 
+#pragma mark - InApp Controls
+
+RCT_EXPORT_METHOD(fetchInApps:(RCTResponseSenderBlock)callback) {
+    RCTLogInfo(@"[CleverTap fetchInApps]");
+    [[self cleverTapInstance]fetchInApps:^(BOOL success) {
+        [self returnResult:@(success) withCallback:callback andError:nil];
+    }];
+}
+
+RCT_EXPORT_METHOD(clearInAppResources:(BOOL)expiredOnly) {
+    RCTLogInfo(@"[CleverTap clearInAppResources");
+    [[self cleverTapInstance] clearInAppResources: expiredOnly];
+}
+
 #pragma mark - Push Permission
 
 - (CTLocalInApp*)_localInAppConfigFromReadableMap: (NSDictionary *)json {

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "clevertap-react-native",
-  "version": "1.2.1",
+  "version": "2.1.0",
   "description": "CleverTap React Native SDK.",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "node install.js",
     "lint": "./node_modules/.bin/eslint index.js */**.js",
     "lint-fix": "./node_modules/.bin/eslint --fix index.js */**.js"
   },
@@ -32,9 +31,6 @@
     "react-native",
     "segmentation"
   ],
-  "dependencies": {
-    "extract-zip": "^1.6.6"
-  },
   "peerDependencies": {
     "react-native": ">=0.63.3"
   },

package/install.js

@@ -1,24 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require('fs')
-const path = require('path')
-const extract = require('extract-zip')
-
-const sdkPath = path.join(__dirname, 'ios/CleverTapReact/'); 
-const zipFile = sdkPath+'CleverTapSDK.framework.zip';
-const errMsg = "error unzipping CleverTapSDK.framework.zip in " + sdkPath + " please unzip manually";
-
-fs.access(zipFile, (err) => {
-  if (!err) {
-	extract(zipFile, {dir: sdkPath}, function (err) {
-        if (!err) {
-            fs.unlinkSync(zipFile);
-        } else {
-            console.log(err);
-            console.error(errMsg);
-        }
-	});
-  } else {
-      console.error(err);
-  }
-});

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/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +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>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

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>