reactnative-plugin-appice 1.5.7 → 1.5.9

package/android/build.gradle

@@ -114,10 +114,11 @@ dependencies {
     annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.3.1"
 
     //appice
-    implementation 'appice.io.android:sdk:2.5.59'
+    implementation 'appice.io.android:sdk:2.5.61'
 
     //glide
-    implementation "com.github.bumptech.glide:glide:4.10.0"
+    implementation "com.github.bumptech.glide:glide:4.11.0"
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
 
 }
 

package/android/src/main/java/com/reactlibrary/AppIceReactPluginModule.java

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -50,7 +51,8 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
     private static final String APPICE_USER_IS_EMPLOYED = "is_emp";
     private static final String APPICE_USER_EMPLOYMENT_TYPE = "et";
     private static final String APPICE_USER_MARRIED = "m";
-    private static final String APPICE_PUSH_NOTIFICATION_CLICKED = "AppICEPushNotificationClicked";
+    public static final String APPICE_PUSH_NOTIFICATION_CLICKED = "AppICEPushNotificationClicked";
+    public static final String APPICE_INAPP_NOTIFICATION_CLICKED = "AppICEInAppClicked";
 
     public AppIceReactPluginModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -325,6 +327,7 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
         constants.put(APPICE_USER_AGE, APPICE_USER_AGE);
         constants.put(APPICE_USER_GENDER, APPICE_USER_GENDER);
         constants.put(APPICE_PUSH_NOTIFICATION_CLICKED, APPICE_PUSH_NOTIFICATION_CLICKED);
+        constants.put(APPICE_INAPP_NOTIFICATION_CLICKED, APPICE_INAPP_NOTIFICATION_CLICKED);
         return constants;
     }
 
@@ -344,26 +347,7 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
         ContextSdk.pushNotificationClicked(payload, ctx);
     }
 
-
-    @ReactMethod
-    public void sendClickCallback(final Callback callback) {
-        ClickCallback clickCallback = new ClickCallback() {
-            @Override
-            public void clickPayload(String obj) {
-                if (obj != null && obj.length() > 0) {
-                    try {
-                        System.out.println("AppICEPlugin : sendClickCallback : "+obj);
-                        callback.invoke(obj);
-                    } catch (Throwable e) {
-                        System.out.println("AppICEPlugin : sendClickCallback : exception "+e);
-                    }
-                }
-            }
-        };
-        CampaignCampsReceiver campaignCampsReceiver = new CampaignCampsReceiver(clickCallback);
-    }
-
-    static void sendEvent(String eventName, @Nullable WritableMap params) {
+    public static void sendEvent(String eventName, @Nullable WritableMap params) {
         try {
             context.
                     getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)

package/android/src/main/java/com/reactlibrary/CampaignCampsReceiver.java

@@ -50,11 +50,9 @@ public class CampaignCampsReceiver extends BroadcastReceiver {
 
             if (category) {
                 if (cdata != null && cdata.length() > 0) {
-                    if (clickCallback != null) {
-                        clickCallback.clickPayload(cdata);
-                        System.out.println("CampaignRec : clickCallback "+cdata);
-                    } else
-                        System.out.println("callback is null");
+                    WritableMap params = Arguments.createMap();
+                    params.putString(AppIceReactPluginModule.APPICE_INAPP_NOTIFICATION_CLICKED, cdata);
+                    AppIceReactPluginModule.sendEvent(AppIceReactPluginModule.APPICE_INAPP_NOTIFICATION_CLICKED, params);
                 }
             }
 
@@ -63,8 +61,8 @@ public class CampaignCampsReceiver extends BroadcastReceiver {
                 if (pushContent != null){
                     WritableMap params = Arguments.createMap();
                     if (pushContent != null){
-                        params.putString("AppICEPushNotificationClicked", pushContent.toString());
-                        AppIceReactPluginModule.sendEvent("AppICEPushNotificationClicked", params);
+                        params.putString(AppIceReactPluginModule.APPICE_PUSH_NOTIFICATION_CLICKED, pushContent.toString());
+                        AppIceReactPluginModule.sendEvent(AppIceReactPluginModule.APPICE_PUSH_NOTIFICATION_CLICKED, params);
                     }
                 }
             }

package/android/src/main/java/com/reactlibrary/NotificationEventService.java

@@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicReference;
 public class NotificationEventService extends JobService {
 
     @Override
-    public boolean onStartJob(JobParameters params) {
+    public boolean onStartJob(final JobParameters params) {
         if (params != null) {
             PersistableBundle bundle = params.getExtras();
             if (bundle != null) {
@@ -31,7 +31,7 @@ public class NotificationEventService extends JobService {
                             rc.sendCallback(bundle1, getApplicationContext());
                             jobFinished(params,false);
                         }
-                    }, 2 * 1000);
+                    }, 1 * 1000);
                 }
             }
         }

package/example/App.js

@@ -101,6 +101,13 @@ console.log('handleAppICETapEvent');
        console.log(data);
     }
   });
+
+  AppICE.addListener(AppICE.AppICEInAppClicked, (event) => {
+    if (typeof event !== 'undefined'){
+      console.log('handleAppICETapEvent', AppICE.AppICEInAppClicked, event.AppICEInAppClicked);
+     // AppICE.pushNotificationClicked(event.AppICEInAppClicked);
+    }
+  });
 }
 const sendEvent = () => {
   console.log("inside sendEvent");
@@ -128,6 +135,11 @@ const setSampleUserID = () => {
 const setLanguage = () => {
   AppICE.setCustomVariable("_lang", "ar-AE");
 
+
+  AppICE.sendClickCallback((value) => {
+    console.log(`INAPP callback`, value);
+  }); 
+
 };
 const sendView = () => {
   AppICE.tagEvent("HomeScreen", {});

package/index.js

@@ -13,6 +13,7 @@ else
 }
 var AppICEReact = {
     AppICEPushNotificationClicked: AppIceReactPlugin.AppICEPushNotificationClicked,
+    AppICEInAppClicked: AppIceReactPlugin.AppICEInAppClicked,
     name: AppIceReactPlugin.n,
     email: AppIceReactPlugin.em,
     phone: AppIceReactPlugin.ph,
@@ -117,14 +118,6 @@ var AppICEReact = {
 
           return map;
     },
-
-    /**
-    * to send inapp callback to app
-    * @param {callback} callback - inapp callbcak send back to app
-    */
-    sendClickCallback: function (callback) {
-        AppIceReactPlugin.sendClickCallback(callback);
-    },
 };
 
 

package/ios/AppICEReactEvent.h

@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface AppICEReactEvent : RCTEventEmitter <RCTBridgeModule, UNUserNotificationCenterDelegate>
 -(void)didReceiveNotificationResponse:(NSNotification *)event;
 + (id)allocWithZone:(NSZone *)zone;
+-(void)InAppCallback:(NSNotification *)event;
 
 @end
 

package/ios/AppICEReactEvent.m

@@ -18,7 +18,7 @@ RCT_EXPORT_MODULE();
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         sharedInstance = [super allocWithZone:zone];
-        [sharedInstance startObserving];
+       // [sharedInstance startObserving];
     });
     return sharedInstance;
 }
@@ -26,16 +26,16 @@ RCT_EXPORT_MODULE();
 
 - (instancetype)init
 {
-    if ((self = [super init]))
-        {
-            [self startObserving];
-        }
+    // if ((self = [super init]))
+    //     {
+    //         [self startObserving];
+    //     }
     return self;
 }
 
 - (NSArray<NSString *> *)supportedEvents
 {
-  return @[kAppICEPushNotificationClicked];
+  return @[kAppICEPushNotificationClicked, kAppICEInAppClicked];
 }
 
 
@@ -44,6 +44,12 @@ RCT_EXPORT_MODULE();
                                              selector:@selector(didReceiveNotificationResponse:)
                                                  name:kAppICEPushNotificationClicked
                                                object:nil];
+
+[[NSNotificationCenter defaultCenter] addObserver:self
+                                              selector:@selector(InAppCallback:)
+                                                    name:kAppICEInAppClicked
+                                                    object:nil];
+
     
 
 }
@@ -60,6 +66,12 @@ RCT_EXPORT_MODULE();
     [self sendEventWithName:kAppICEPushNotificationClicked body:event.userInfo];
 }
 
+-(void)InAppCallback:(NSNotification *)event{
+    NSLog(@"from InAppCallback %@",event);
+    NSMutableDictionary * eventDict = [[NSMutableDictionary alloc]init];
+    [eventDict setObject:event.userInfo forKey:kAppICEInAppClicked];
+    [self sendEventWithName:kAppICEInAppClicked body:eventDict];
+}
 
 @end
 

package/ios/AppIceReactPlugin.h

@@ -1,6 +1,8 @@
 #import <React/RCTBridgeModule.h>
 #import <UserNotifications/UserNotifications.h>
 static NSString *const kAppICEPushNotificationClicked = @"AppICEPushNotificationClicked";
+static NSString *const kAppICEInAppClicked = @"AppICEInAppClicked";
+
 static NSString *const kn = @"n";
 static NSString *const kem = @"em";
 static NSString *const kph = @"ph";

package/ios/AppIceReactPlugin.m

@@ -14,15 +14,16 @@ RCT_EXPORT_MODULE()
 - (NSDictionary *)constantsToExport {
     return @{
         kAppICEPushNotificationClicked : kAppICEPushNotificationClicked,
+        kAppICEInAppClicked : kAppICEInAppClicked,
         kn : kn,
-        kem : "e",
-        kph : "p",
+        kem : @"e",
+        kph : @"p",
         ka : ka,
         kg : kg,
-        ked : "edt",
-        ket : "emt",
+        ked : @"edt",
+        ket : @"emt",
         km : km,
-        kis_emp : "em"
+        kis_emp : @"em"
     };
 }
 - (dispatch_queue_t)methodQueue {
@@ -54,7 +55,9 @@ RCT_EXPORT_METHOD(startContext:(NSString *)appID
     [appICE setTokenInPushNotification:[[NSUserDefaults standardUserDefaults]objectForKey:kappICEToken]];
     [[NSUserDefaults standardUserDefaults] removeObjectForKey:kappICEToken];
     }
+    [self setClickCallback];
 }
+
 /**
  * didRegisterForRemoteNotificationsWithDeviceToken sets the device token in sdk or userdefaults depends upon sdk initalise.
  * @param deviceToken  token in form of NSData
@@ -107,7 +110,7 @@ RCT_EXPORT_METHOD(pushNotificationClicked:(NSDictionary*)userInfo)
 RCT_EXPORT_METHOD(setUser:(NSDictionary*)userProfile)
 {
         NSArray *items =  [NSArray arrayWithObjects:kAIUserName,kAIUserEmail,kAIUserPhone,kAIUserGender,kAIUserBirthYear,kAIUserAge,kAIUserIsUserEmployed,kAIUserEmploymentType,kAIUserEducationType,kAIUserIsUserMarried, nil];
-        
+        appICEUserDetails *app=[appICEUserDetails new];
         for(int i= 0; i< items.count ;i++)
         {
           
@@ -160,38 +163,26 @@ RCT_EXPORT_METHOD(setUser:(NSDictionary*)userProfile)
     [[NSNotificationCenter defaultCenter] postNotificationName:kAppICEPushNotificationClicked object:nil userInfo:event];
 }
 
+RCT_EXPORT_METHOD(inAppClicked:(NSDictionary*)userInfo)
+{
+    RCTLog(@"from inAppClicked method = %@",userInfo);
+}
+
 + (void)pushNotificationReceived:(NSDictionary *)userInfo {
     [[appICE sharedInstance]pushNotificationReceived:userInfo];
 }
 
 //InApp Deeplink Callback
-RCT_EXPORT_METHOD(sendClickCallback:(RCTResponseSenderBlock)successCallback)
+- (void)setClickCallback
 {
-    
     [[appICE sharedInstance] setClickCallback:^(NSDictionary * _Nonnull cData) {
         // Convert cData to JSON string
-            NSError *error;
-            NSData *jsonData = [NSJSONSerialization dataWithJSONObject:cData options:NSJSONWritingPrettyPrinted error:&error];
-            
-        NSString *jsonString;
-            if (!error) {
-                if (jsonData != nil || [jsonData length] != 0) {
-                jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-                RCTLog(@"***** INapp success *** %@", jsonString);
-                }
-                else {
-                    jsonString = @"{}"; 
+                if (cData != nil || cData.count > 0) {
+                RCTLog(@"***** INapp success *** %@", cData);
+                       [[NSNotificationCenter defaultCenter] postNotificationName:kAppICEInAppClicked object:nil userInfo:cData];
+
                 }
-            } else {
-                jsonString = @"{}"; // Handle error case
-            }
-        // Check again if successCallback is not nil
-        if(successCallback != nil)
-        {
-            // Invoke successCallback with JSON string
-            successCallback(@[jsonString]);
-        }
-           
+
     }];
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactnative-plugin-appice",
-  "version": "1.5.7",
+  "version": "1.5.9",
   "description": "appICE React Native SDK",
   "main": "index.js",
   "files": [