clevertap-react-native 0.7.0 → 0.9.0

package/android/build.gradle

@@ -21,8 +21,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 31
-        versionCode 70
-        versionName "0.7.0"
+        versionCode 90
+        versionName "0.9.0"
     }
     buildTypes {
         release {
@@ -39,7 +39,7 @@ dependencies {
         maven { url "$rootDir/../node_modules/react-native/android" }
     }
 
-    api 'com.clevertap.android:clevertap-android-sdk:4.3.1'
+    api 'com.clevertap.android:clevertap-android-sdk:4.6.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
     //compile 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.facebook.react:react-native:+'

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

@@ -0,0 +1,79 @@
+package com.clevertap.react;
+
+import static com.clevertap.react.CleverTapUtils.getWritableMapFromMap;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import com.clevertap.android.sdk.Application;
+import com.clevertap.android.sdk.CleverTapAPI;
+import com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import org.json.JSONObject;
+
+public class CleverTapApplication extends Application implements CTPushNotificationListener {
+    private static final String TAG = "CleverTapApplication";
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        CleverTapAPI.getDefaultInstance(this)
+                .setCTPushNotificationListener(this);// Workaround when app is in killed state
+    }
+
+    //Push Notification Clicked callback workaround when app is in killed state
+    @Override
+    public void onNotificationClickedPayloadReceived(final HashMap<String, Object> payload) {
+        Log.e(TAG, "onNotificationClickedPayloadReceived called");
+        final String CLEVERTAP_PUSH_NOTIFICATION_CLICKED = "CleverTapPushNotificationClicked";
+
+        Handler handler = new Handler(Looper.getMainLooper());
+        handler.post(new Runnable() {
+            public void run() {
+
+                // Construct and load our normal React JS code bundle
+                final ReactInstanceManager mReactInstanceManager = ((ReactApplication) getApplicationContext())
+                        .getReactNativeHost().getReactInstanceManager();
+                ReactContext context = mReactInstanceManager.getCurrentReactContext();
+                // If it's constructed, send a notification
+                if (context != null) {
+                    sendEvent(CLEVERTAP_PUSH_NOTIFICATION_CLICKED, getWritableMapFromMap(payload), context);
+                } else {
+                    // Otherwise wait for construction, then send the notification
+                    mReactInstanceManager
+                            .addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
+                                public void onReactContextInitialized(ReactContext context) {
+                                    sendEvent(CLEVERTAP_PUSH_NOTIFICATION_CLICKED, getWritableMapFromMap(payload),
+                                            context);
+                                    mReactInstanceManager.removeReactInstanceEventListener(this);
+                                }
+                            });
+                    if (!mReactInstanceManager.hasStartedCreatingInitialContext()) {
+                        // Construct it in the background
+                        mReactInstanceManager.createReactContextInBackground();
+                    }
+                }
+
+            }
+        });
+
+    }
+
+    private void sendEvent(String eventName, Object params, ReactContext context) {
+        try {
+            context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                    .emit(eventName, params);
+            Log.e(TAG, "Sending event "+eventName);
+        } catch (Throwable t) {
+            Log.e(TAG, t.getLocalizedMessage());
+        }
+    }
+
+}

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

@@ -1,5 +1,7 @@
 package com.clevertap.react;
 
+import static com.clevertap.react.CleverTapUtils.getWritableMapFromMap;
+
 import android.location.Location;
 import android.net.Uri;
 import android.os.Build.VERSION;
@@ -1406,28 +1408,6 @@ public class CleverTapModule extends ReactContextBaseJavaModule implements SyncL
         return writableArray;
     }
 
-    @SuppressWarnings({"TypeParameterExplicitlyExtendsObject", "rawtypes"})
-    private WritableMap getWritableMapFromMap(Map<String, ? extends Object> var1) {
-        JSONObject extras = var1 != null ? new JSONObject(var1) : new JSONObject();
-        WritableMap extrasParams = Arguments.createMap();
-        Iterator extrasKeys = extras.keys();
-        while (extrasKeys.hasNext()) {
-            String key = null;
-            String value = null;
-            try {
-                key = extrasKeys.next().toString();
-                value = extras.get(key).toString();
-            } catch (Throwable t) {
-                Log.e(TAG, t.getLocalizedMessage());
-            }
-
-            if (key != null && value != null) {
-                extrasParams.putString(key, value);
-            }
-        }
-        return extrasParams;
-    }
-
     private HashMap<String, Object> profileFromReadableMap(ReadableMap profileMap) {
         if (profileMap == null) {
             return null;

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

@@ -0,0 +1,36 @@
+package com.clevertap.react;
+
+import android.util.Log;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
+import java.util.Iterator;
+import java.util.Map;
+import org.json.JSONObject;
+
+public class CleverTapUtils {
+
+    private static final String TAG = "CleverTapUtils";
+
+    @SuppressWarnings({"TypeParameterExplicitlyExtendsObject", "rawtypes"})
+    public static WritableMap getWritableMapFromMap(Map<String, ? extends Object> var1) {
+        JSONObject extras = var1 != null ? new JSONObject(var1) : new JSONObject();
+        WritableMap extrasParams = Arguments.createMap();
+        Iterator extrasKeys = extras.keys();
+        while (extrasKeys.hasNext()) {
+            String key = null;
+            String value = null;
+            try {
+                key = extrasKeys.next().toString();
+                value = extras.get(key).toString();
+            } catch (Throwable t) {
+                Log.e(TAG, t.getLocalizedMessage());
+            }
+
+            if (key != null && value != null) {
+                extrasParams.putString(key, value);
+            }
+        }
+        return extrasParams;
+    }
+
+}

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', '3.10.0'
-  s.dependency 'React'
+  s.dependency 'CleverTap-iOS-SDK', '4.0.0'
+  s.dependency 'React-Core'
 end

package/docs/install.md

@@ -60,9 +60,9 @@ If you're on RN 0.60 or your project configuration doesn't allow to add `use_fra
 ```gradle
 dependencies {
 	...
-    implementation 'com.clevertap.android:clevertap-android-sdk:4.3.1'
+    implementation 'com.clevertap.android:clevertap-android-sdk:4.6.0'
     implementation 'com.google.android.gms:play-services-base:17.6.0'
-    implementation 'com.google.firebase:firebase-messaging:20.2.4'
+    implementation 'com.google.firebase:firebase-messaging:21.0.0'
     implementation 'com.google.android.exoplayer:exoplayer:2.15.1' //Optional for Audio/Video
     implementation 'com.google.android.exoplayer:exoplayer-hls:2.15.1' //Optional for Audio/Video
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.15.1' //Optional for Audio/Video

package/docs/integration.md

@@ -11,11 +11,11 @@ After [install](./install.md), you will need to integrate the CleverTap SDK into
 ```
 NOTE:  Don't forget to add the CleverTap imports at the top of the file.
 ```objc
-#import <CleverTapSDK/CleverTap.h>
-#import <CleverTapReact/CleverTapReactManager.h>
+#import <CleverTap-iOS-SDK/CleverTap.h>
+#import <clevertap-react-native/CleverTapReactManager.h>
 ```
 
-Note: Need to use **@import CleverTapSDK;** instead of **#import <CleverTapSDK/CleverTap.h>** and **@import CleverTapReact;** instead of **#import <CleverTapReact/CleverTapReactManager.h>** in the AppDelegate class in case if using ```use_modular_headers!``` in the podfile.
+Note: Need to use **@import CleverTapSDK;** instead of **#import <CleverTap-iOS-SDK/CleverTap.h>** and **@import CleverTapReact;** instead of **#import <clevertap-react-native/CleverTapReactManager.h>** in the AppDelegate class in case if using ```use_modular_headers!``` in the podfile.
 
 [See the Example Project](/Example/ios/Example/AppDelegate.m).
 
@@ -71,5 +71,17 @@ Note: Need to use **@import CleverTapSDK;** instead of **#import <CleverTapSDK/C
         // ...
     }
     ```
+4. From clevertap-react-native **v0.8.1** onwards developers can make their `Application` class extend `CleverTapApplication` to support Push Notification click callback out of the box and to register activity lifecycle events. Before v0.8.1 developers were forced to write logic for push click callback and register activity lifecycle to their `Application` class manually which is being abstract out in `CleverTapApplication` class.
+ 
+    ```
+   import com.clevertap.react.CleverTapApplication;
+   // other imports
+   
+   public class MainApplication extends CleverTapApplication
+           implements ActivityLifecycleCallbacks, ReactApplication
+   {
+        // ...
+   }
+    ```
 [see the included Example Project](/Example/App.js) 
 

package/docs/usage.md

@@ -74,6 +74,12 @@ CleverTap.profileDecrementValueForKey(1, "score");
 CleverTap.recordEvent('testEvent');
 ```
 
+#### Record an event with event Properties  
+
+```javascript 
+CleverTap.recordEvent('Product Viewed', {'Product Name': 'Dairy Milk','Category': 'Chocolate','Amount': 20.00});
+```
+
 #### Record Charged event
 
 ```javascript 

package/index.d.ts

@@ -295,7 +295,8 @@
   export function getCleverTapID(callback: Callback): void;
 
   /**
-   * Remove the property specified by key from the user profile
+   * Remove the property specified by key from the user profile. Alternatively this method
+   * can also be used to remove PII data (for eg. Email,Name,Phone), locally from database and shared prefs
    * @param key {string}
    */
   export function profileRemoveValueForKey(key: string): void;

package/index.js

@@ -379,7 +379,8 @@ var CleverTap = {
     },
 
     /**
-    * Remove a key-value from the user profile
+    * Remove a key-value from the user profile. Alternatively this method can also be used to remove PII data
+    * (for eg. Email,Name,Phone), locally from database and shared prefs
     * @param {string} the key to remove
     */
     profileRemoveValueForKey: function (key) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clevertap-react-native",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "CleverTap React Native SDK.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -36,7 +36,7 @@
     "extract-zip": "^1.6.6"
   },
   "peerDependencies": {
-    "react-native": ">=0.47.0"
+    "react-native": ">=0.63.3"
   },
   "devDependencies": {
     "eslint": "^4.18.2",
@@ -47,7 +47,7 @@
     "eslint-plugin-react": "^6.2.0",
     "eslint-plugin-standard": "^2.0.0",
     "i": "^0.3.6",
-    "react": "^16.3.2",
+    "react": "^17.0.2",
     "react-native": "^0.49.5"
   }
 }