cordova-plugin-appice 2.1.1 → 2.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-appice",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "AppICE Plugin for Cordova/PhoneGap",
   "cordova": {
     "id": "cordova-plugin-appice",

package/plugin.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-appice" version="2.1.1">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
+    id="cordova-plugin-appice" version="2.1.3">
     <name>AppICE</name>
     <description>AppICE Plugin for Cordova/PhoneGap</description>
     <license>Commercial</license>
@@ -113,12 +114,15 @@
         <preference name="WORK_MANAGER_VERSION" default="2.7.1"/>
 
         <!-- AppICE VERSION-->
-        <preference name="APPICE_VERSION" default="2.5.67"/>
+        <preference name="APPICE_VERSION" default="2.5.70-release"/>
 
 
         <!-- USES PERMISSION -->
         <config-file target="AndroidManifest.xml" parent="/manifest">
             <uses-permission android:name="android.permission.INTERNET"/>
+
+            <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+            <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
         </config-file>
 
         <!-- MANIFEST ENTRIES -->

package/src/android/AppICEPlugin.java

@@ -2,9 +2,9 @@ package com.appice.cordova;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -29,18 +29,22 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
 
 import semusi.activitysdk.Api;
 import semusi.activitysdk.ContextData;
 import semusi.activitysdk.ContextSdk;
 import semusi.activitysdk.SdkConfig;
 import semusi.activitysdk.User;
+import semusi.context.utility.Utility;
+
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 public class AppICEPlugin extends CordovaPlugin {
 
+    private final String CALLBACK_CONSTANTS = "pendingCallback";
+    private static final String TEMP_DB = "AppICETempDB";
+
+    private static boolean statusFlag = false;
     private static final String TAG = AppICEPlugin.class.getSimpleName();
     private static final Map<String, Method> exportedMethods;
     private static boolean inBackground = true;
@@ -48,7 +52,8 @@ public class AppICEPlugin extends CordovaPlugin {
     private static CallbackContext callbackContext;
 
     @Retention(RUNTIME)
-    @interface CordovaMethod { }
+    @interface CordovaMethod {
+    }
 
     static {
         HashMap<String, Method> methods = new HashMap<String, Method>();
@@ -69,7 +74,6 @@ public class AppICEPlugin extends CordovaPlugin {
 
     @Override
     public void onResume(boolean multitasking) {
-        AppICEPlugin.inBackground = false;
     }
 
     @Override
@@ -77,6 +81,15 @@ public class AppICEPlugin extends CordovaPlugin {
         AppICEPlugin.notificationCallbackContext = null;
     }
 
+    @Override
+    public void onDestroy() {
+    }
+
+    @Override
+    public void onStop() {
+        statusFlag = false;
+    }
+
     public static boolean inBackground() {
         return AppICEPlugin.inBackground;
     }
@@ -89,107 +102,39 @@ public class AppICEPlugin extends CordovaPlugin {
     public void initialize(CordovaInterface cordova, CordovaWebView webView) {
         super.initialize(cordova, webView);
 
+
         onNewIntent(cordova.getActivity().getIntent());
     }
 
     public void onNewIntent(Intent intent) {
         if (intent == null) return;
-        System.out.println("onNewIntent intent "+intent);
         try {
-            if (intent.getAction() != null && intent.getAction().equals(Intent.ACTION_VIEW)) {
-                Uri data = intent.getData();
-                if (data != null) {
-                    final String json = "{'deeplink':'" + data.toString() + "'}";
+            Bundle extras = intent.getExtras();
+            String payload = extras.getString("ai_content");
+            boolean isPushNotification = (payload != null && payload.length() > 0) ? true : false;
+            if (isPushNotification) {
+                JSONObject data = new JSONObject(payload);
 
-                    cordova.getActivity().runOnUiThread(new Runnable() {
+                final String json = "{'payload':" + data.toString() + "}";
+                System.out.println("AppICE : onNewIntent : json "+json);
+                if (statusFlag) {
+                    webView.getView().post(new Runnable() {
                         @Override
                         public void run() {
-                            webView.loadUrl("javascript:cordova.fireDocumentEvent('onDeepLink'," + json + ");");
+                            webView.loadUrl("javascript:cordova.fireDocumentEvent('pushNotificationClicked'," + json + ");");
                         }
                     });
+                } else {
+                    storeTempData(CALLBACK_CONSTANTS, json, cordova.getActivity());
                 }
-            }
-            // push notification
-            else {
-
-                new Timer("AppICE-NotifService-Timer").schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-
-                        try{
-                            String url = "";
-                            Bundle extras = intent.getExtras();
-                            System.out.println("onNewIntent bundle "+extras);
-                            String payload = extras.getString("ai_content");
-                            boolean isPushNotification = (payload !=  null && payload.length()>0)?true:false;
-                            if (isPushNotification) {
-                                JSONObject data = new JSONObject(payload);
-
-                                try {
-                                    url = data.optString("eurl");
-                                    if (data.has("cdata")) {
-                                        JSONObject cDATA = data.optJSONObject("cdata");
-                                        String test = cDATA.optString("eurl");
-                                        if (test != null && test.length()>0){
-                                            url = test;
-                                        }
-                                    }
-                                    System.out.println("chromium : url "+url);
-                                    if (url != null && url.length()>0){
-                                        final String json = "{'deeplink':'" + url + "'}";
-
-                                        webView.getView().post(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                webView.loadUrl("javascript:cordova.fireDocumentEvent('onDeepLink'," + json + ");");
-                                            }
-                                        });
-
-                                    }
-                                }catch (Throwable t){
-                                    Log.e(TAG, "onNewIntent: customDeeplinkError ", t );
-                                }
 
-
-                                final String json = "{'payload':" + data.toString() + "}";
-                                webView.getView().post(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        webView.loadUrl("javascript:cordova.fireDocumentEvent('pushNotificationClicked'," + json + ");");
-                                    }
-                                });
-
-                                try {
-                                    if (data.has("cdata")) {
-                                        JSONObject cDATA = data.optJSONObject("cdata");
-                                        final String customData = "{'customData':'" + cDATA.toString() + "'}";
-
-                                        webView.getView().post(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                webView.loadUrl("javascript:cordova.fireDocumentEvent('onCustomDataCallback'," + customData + ");");
-                                            }
-                                        });
-                                    }
-                                }catch (Throwable t){
-                                    Log.e(TAG, "onNewIntent: customDataError ", t);
-                                }
-
-                                ContextSdk.pushNotificationClicked(payload, cordova.getActivity().getApplicationContext());
-                            }
-
-
-                        }catch (Throwable throwable){}
-
-                    }
-                }, 1000);
+                ContextSdk.pushNotificationClicked(payload, cordova.getActivity().getApplicationContext());
             }
-        }catch (Throwable throwable){
+        } catch (Throwable throwable) {
+            Log.e(TAG, "onNewIntent: error ", throwable);
         }
-
     }
 
-
     @Override
     public boolean execute(String action, JSONArray data, CallbackContext callbackId) {
         Method method = exportedMethods.get(action);
@@ -297,6 +242,31 @@ public class AppICEPlugin extends CordovaPlugin {
         }
     }
 
+    @CordovaMethod
+    private void isDeviceReady(JSONArray data, CallbackContext callbackContext) {
+        try {
+            if (statusFlag==false) {
+                checkIfAnyPendingCallback(cordova.getActivity());
+            }
+            statusFlag = true;
+            callbackContext.success();
+
+        } catch (Throwable e) {
+            callbackContext.error(e.getMessage());
+        }
+    }
+
+    private void checkIfAnyPendingCallback(Context context) {
+        String pendingCallbackStr = loadTempData(CALLBACK_CONSTANTS, context);
+        webView.getView().post(new Runnable() {
+            @Override
+            public void run() {
+                webView.loadUrl("javascript:cordova.fireDocumentEvent('pushNotificationClicked'," + pendingCallbackStr + ");");
+                resetTempData(CALLBACK_CONSTANTS, context);
+            }
+        });
+    }
+
     @CordovaMethod
     private void stopContext(JSONArray data, CallbackContext callbackContext) {
         try {
@@ -323,7 +293,7 @@ public class AppICEPlugin extends CordovaPlugin {
             };
             mainHandler.post(myRunnable);
 
-        }catch (Throwable t){
+        } catch (Throwable t) {
             callbackContext.error(t.getMessage());
         }
     }
@@ -697,9 +667,9 @@ public class AppICEPlugin extends CordovaPlugin {
     }
 
     @CordovaMethod
-    private void pushNotificationClicked(JSONArray data, final CallbackContext callbackContext){
+    private void pushNotificationClicked(JSONArray data, final CallbackContext callbackContext) {
         try {
-            if(data != null){
+            if (data != null) {
                 String payload = (String) data.getJSONObject(0).get("pushPayload");
                 ContextSdk.pushNotificationClicked(payload, cordova.getActivity().getApplicationContext());
                 callbackContext.success();
@@ -711,9 +681,9 @@ public class AppICEPlugin extends CordovaPlugin {
     }
 
     @CordovaMethod
-    private void getDeepLinkURL(JSONArray data, final CallbackContext callbackContext){
+    private void getDeepLinkURL(JSONArray data, final CallbackContext callbackContext) {
         try {
-            if(data != null){
+            if (data != null) {
                 String url = "";
                 String payload = (String) data.getJSONObject(0).get("pushPayload");
                 JSONObject object = new JSONObject(payload);
@@ -735,7 +705,6 @@ public class AppICEPlugin extends CordovaPlugin {
             @Override
             public void run() {
                 try {
-                    System.out.println("testing send notification "+bundle);
                     if (callbackContext != null) {
                         String pushPaylaod = bundle.getString("ai_content");
                         PluginResult result = new PluginResult(PluginResult.Status.OK, pushPaylaod);
@@ -749,6 +718,7 @@ public class AppICEPlugin extends CordovaPlugin {
         }).start();
     }
 
+
     //==================================
     // SESSION SETTING APIS
     //==================================
@@ -974,7 +944,7 @@ public class AppICEPlugin extends CordovaPlugin {
 
                         callbackContext.success();
                     } catch (Throwable e) {
-                        Log.e(TAG, "trackScreens run: error ", e );
+                        Log.e(TAG, "trackScreens run: error ", e);
                     }
                 }
             }).start();
@@ -982,4 +952,41 @@ public class AppICEPlugin extends CordovaPlugin {
             callbackContext.error(e.getMessage());
         }
     }
+
+    public static void storeTempData(String key, String value, Context context) {
+        try {
+            SharedPreferences sp = context.getSharedPreferences(TEMP_DB,
+                    Context.MODE_PRIVATE);
+            SharedPreferences.Editor edit = sp.edit();
+            edit.putString(key, value);
+            edit.apply();
+        } catch (Throwable e) {
+            Log.e(TAG, "storeTempData: error ", e);
+        }
+    }
+
+    public static void resetTempData(String key, Context context) {
+        try {
+            SharedPreferences sp = context.getSharedPreferences(TEMP_DB,
+                    Context.MODE_PRIVATE);
+            SharedPreferences.Editor edit = sp.edit();
+            edit.remove(key);
+            edit.apply();
+        } catch (Throwable e) {
+            Log.e(TAG, "resetTempData: error ", e);
+        }
+    }
+
+
+    public static String loadTempData(String key, Context ctx) {
+        String name = "";
+        try {
+            SharedPreferences sp = ctx.getSharedPreferences(TEMP_DB,
+                    Context.MODE_PRIVATE);
+            name = sp.getString(key, "");
+        } catch (Throwable e) {
+            Log.e(TAG, "loadTempData: error ", e);
+        }
+        return name;
+    }
 }

package/src/android/AppICEPushHandler.java

@@ -88,7 +88,7 @@ public class AppICEPushHandler {
             bundle.putString(PUSH_PAYLOAD, message);
             clickIntent.putExtras(bundle);
 
-            Utility.sendEventToListener(mContext, newIntent);
+          //  Utility.sendEventToListener(mContext, newIntent);
             return PendingIntent.getActivity(
                     mContext, 1, clickIntent, getPendingIntentFlags());
         } catch (Throwable e) {

package/src/ios/AppICEPlugin.h

@@ -89,5 +89,8 @@ static NSString* const AIHandleActionNotification = @"AIHandleActionNotification
 -(void)pushNotificationClicked:(CDVInvokedUrlCommand *)command;
 -(void)getDeepLinkURL:(CDVInvokedUrlCommand *)command;
 
+//new empty function
+-(void)isDeviceReady:(CDVInvokedUrlCommand *)command;
+
 @end
 

package/src/ios/AppICEPlugin.m

@@ -158,40 +158,23 @@ static NSInteger const kNotificationStackSize = 10;
 -(void)onHandleNotificationUResponse:(NSDictionary *)userInfo {
     @try {
         NSLog(@"appice - uresponse : %@",userInfo);
-        NSString *deepLinkurl = @"";
-        [[appICE sharedInstance]handleClickOnPush:userInfo OpenDeepLink:YES];
+       
+       
         
         if (userInfo != nil && userInfo.count >0){
-            NSLog(@"appice - getDeepLinkURL : %@", userInfo);
-   
-            
-            if ([userInfo valueForKeyPath:@"data.message.cdata.eurl"]) {
-                // Extract the 'eurl' key from 'cdataDictionary'
-                deepLinkurl = [userInfo valueForKeyPath:@"data.message.cdata.eurl"];
-            }
-            else
-            {
-                // If 'user' is still empty, attempt to extract 'eurl' directly from the payload
-                if([userInfo valueForKeyPath:@"data.message.eurl"])
-                {
-                    deepLinkurl = [userInfo valueForKeyPath:@"data.message.eurl"];
-                }
-            }
           
-            NSLog(@"Value of 'user': %@", deepLinkurl);
-       
-            NSString *js = [NSString stringWithFormat:@"onDeepLink({'deeplink':'%@'});",deepLinkurl];
+            [[appICE sharedInstance]handleClickOnPush:userInfo OpenDeepLink:YES];
+            
+            NSDictionary *pushPayload = [userInfo valueForKeyPath:@"data.message"];
+            NSData *payloadData = [NSJSONSerialization dataWithJSONObject:pushPayload
+                                                                  options:kNilOptions
+                                                                    error:nil];
+            NSString *payloadString = [[NSString alloc] initWithData:payloadData encoding:NSUTF8StringEncoding];
+            NSLog(@"payloadString string: %@", payloadString);
+            
+            NSString *js = [NSString stringWithFormat:@"pushNotificationClicked({'payload':'%@'});",payloadString];
             [self.commandDelegate evalJs:js];
         }
-        NSDictionary *pushPayload = [userInfo valueForKeyPath:@"data.message"];
-        NSData *payloadData = [NSJSONSerialization dataWithJSONObject:pushPayload
-                                                                   options:kNilOptions
-                                                                     error:nil];
-        NSString *payloadString = [[NSString alloc] initWithData:payloadData encoding:NSUTF8StringEncoding];
-        NSLog(@"payloadString string: %@", payloadString);
-        
-        NSString *js = [NSString stringWithFormat:@"pushNotificationClicked({'payload':'%@'});",payloadString];
-        [self.commandDelegate evalJs:js];
 
     } @catch (NSException *exception) {
         NSLog(@"appice - uresponse : %@",exception.description);
@@ -1101,6 +1084,12 @@ static NSInteger const kNotificationStackSize = 10;
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
+// new empty function
+-(void)isDeviceReady:(CDVInvokedUrlCommand *)command {
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
 @end
 
 

package/www/AppICE.js

@@ -67,6 +67,10 @@ cordova.define("cordova-plugin-appice.AppICE", function (require, exports, modul
     cordova.exec(success, error, "AppICEPlugin", "registerLifeCycle", []);
   };
 
+  AppICE.prototype.isDeviceReady = function (success, error) {
+    cordova.exec(success, error, "AppICEPlugin", "isDeviceReady", []);
+  };
+
   //==================================
   // PLAY STORE SETTING APIS
   //==================================
@@ -213,27 +217,42 @@ cordova.define("cordova-plugin-appice.AppICE", function (require, exports, modul
 
   AppICE.prototype.getDataForKey = function (payload, key, success, error) {
     try {
-      let parsedPayload;
-
-      // Check if payload is a string
-      if (typeof payload === 'string') {
-        // Parse the payload string to JSON
-        parsedPayload = JSON.parse(payload);
-      } else {
-        // Use the payload directly if it's already an object
-        parsedPayload = payload;
-      }
-
-      // Check if the key exists in the payload
-      if (parsedPayload.hasOwnProperty(key)) {
-        // Extract the value and return it
-        const value = parsedPayload[key];
-        success(value);
-      }
-    } catch (error) {
-      error(error)
+          let parsedPayload;
+
+          // if payload is a string
+          if (typeof payload === 'string') {
+              // Parse the payload string to JSON
+              parsedPayload = JSON.parse(payload);
+          } else {
+              // if already an object
+              parsedPayload = payload;
+          }
+
+          // if key exist then return the value
+          if (parsedPayload.hasOwnProperty(key)) {
+              success(parsedPayload[key]);
+          }
+
+          // check for active camps in case of who + what payload
+          if (parsedPayload.hasOwnProperty('activeCampaigns') && parsedPayload.activeCampaigns.length > 0) {
+              const data = parsedPayload.activeCampaigns[0].data;
+              if (data && data.hasOwnProperty(key)) {
+                  success(data[key]);
+              }
+              // activeCamps => cdata
+              if (data && data.hasOwnProperty('cdata') && data.cdata.hasOwnProperty(key)) {
+                  success(data.cdata[key]);
+              }
+          }
+
+          if (parsedPayload.hasOwnProperty('cdata') && parsedPayload.cdata.hasOwnProperty(key)) {
+              success(parsedPayload.cdata[key]);
+          }
+
+          error('something is wrong please try again with valid data');
+    } catch (errMessage) {
+      error(errMessage)
     }
-
   };
 
   //===============================