cordova-plugin-appice 2.2.6 → 2.2.8

package/package.json

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

package/plugin.xml

@@ -1,6 +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.2.6">
+    id="cordova-plugin-appice" version="2.2.8">
     <name>AppICE</name>
     <description>AppICE Plugin for Cordova/PhoneGap</description>
     <license>Commercial</license>
@@ -41,7 +41,7 @@
 
         <podspec>
             <pods>
-                <pod name="AppICE-IOS-SDK" spec="1.8.01" />
+                <pod name="AppICE-IOS-SDK" spec="1.8.02" />
             </pods>
         </podspec>
 
@@ -121,7 +121,7 @@
         <preference name="MEDIA3_UI_VERSION" default="1.0.2"/>
 
         <!-- AppICE VERSION-->
-        <preference name="APPICE_VERSION" default="2.6.12"/>
+        <preference name="APPICE_VERSION" default="2.6.17"/>
 
 
         <!-- USES PERMISSION -->

package/src/android/AppICEPlugin.java

@@ -62,6 +62,7 @@ public class AppICEPlugin extends CordovaPlugin {
     private static boolean inBackground = true;
     private static CallbackContext notificationCallbackContext;
     private static CallbackContext callbackContext;
+    private static CordovaWebView mwebView;
 
     @Retention(RUNTIME)
     @interface CordovaMethod {
@@ -114,7 +115,7 @@ public class AppICEPlugin extends CordovaPlugin {
     @Override
     public void initialize(CordovaInterface cordova, CordovaWebView webView) {
         super.initialize(cordova, webView);
-
+        mwebView = webView;
         onNewIntent(cordova.getActivity().getIntent());
     }
 
@@ -739,22 +740,25 @@ public class AppICEPlugin extends CordovaPlugin {
         }
     }
 
-    public static void sendNotification(JSONObject bundle, Context context) {
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    if (callbackContext != null) {
-                        String pushPaylaod = bundle.getString("ai_content");
-                        PluginResult result = new PluginResult(PluginResult.Status.OK, pushPaylaod);
-                        result.setKeepCallback(true);
-                        callbackContext.sendPluginResult(result);
+    public void sendNotification(JSONObject bundle, Context context) {
+        try {
+            String pushPayload = bundle.getString("ai_content");
+            String eventName = "pushNotificationClicked";
+            String js = "cordova.fireDocumentEvent('" + eventName + "', { payload: " + pushPayload + " });";
+
+            if (mwebView != null && mwebView.getEngine() != null) {
+                mwebView.getView().post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mwebView.getEngine().evaluateJavascript(js, null);             
                     }
-                } catch (Throwable e) {
-                    Utility.loginfo("Runnable: error "+e);
-                }
-            }
-        }).start();
+                });
+            } else {
+                Utility.loginfo("WebView or its engine is null");
+            }    
+        } catch (Exception e) {
+            Utility.loginfo("Error sending notification to JS "+e);
+        }
     }
 
     // ==================================
@@ -1585,7 +1589,7 @@ public class AppICEPlugin extends CordovaPlugin {
                 public void run() {
                     ClickCallback clickCallback = new ClickCallback() {
                         @Override
-                        public void clickPayload(String obj) {
+                        public void clickPayload(JSONObject obj) {
                             if (Utility.isValidObject(obj)) {
                                 if (callbackContext != null) {
                                     try {
@@ -1601,7 +1605,6 @@ public class AppICEPlugin extends CordovaPlugin {
                     CampaignCampsReceiver campaignCampsReceiver = new CampaignCampsReceiver(clickCallback);
                 }
             });
-            callbackContext.success();
         } catch (Throwable e) {
             callbackContext.error(e.getMessage());
         }

package/src/android/CampaignCampsReceiver.java

@@ -46,8 +46,9 @@ public class CampaignCampsReceiver extends BroadcastReceiver {
 
             if (inApp) {
                 if (cdata != null && cdata.length() > 0) {
+                    JSONObject cdataObject =  new JSONObject(cdata);
                     if (clickCallback != null) {
-                        clickCallback.clickPayload(cdata);
+                        clickCallback.clickPayload(cdataObject);
                         Utility.loginfo("CampaignRec : clickCallback "+cdata);
                     } else
                         Utility.loginfo("callback is null");
@@ -103,7 +104,8 @@ public class CampaignCampsReceiver extends BroadcastReceiver {
                 Log.e(TAG, "sendCallback: error ",e );
             }
 
-            AppICEPlugin.sendNotification(json, context);
+            AppICEPlugin plugin=new AppICEPlugin();
+            plugin.sendNotification(json, context);
         } catch (Throwable e) {
             Log.e(TAG, "sendCallback: error ",e );
         }

package/src/android/ClickCallback.java

@@ -1,6 +1,7 @@
 package com.appice.cordova;
+import org.json.JSONObject;
 
 public interface ClickCallback {
-    void clickPayload(String obj);
+    void clickPayload(JSONObject obj);
 
 }

package/src/ios/AppICEPlugin.m

@@ -1584,9 +1584,7 @@ static NSDictionary *pendingDeeplink = nil;
 - (void)suspendInApp:(CDVInvokedUrlCommand *)command {
     [self.commandDelegate runInBackground:^{
         @try {
-           // [[appICE sharedInstance] suspendInApp];
-            /**NOTE: As suspendInApp is queing the INAPP ,calling discardInApp in suspendInApp function which will do NOTHING (not queue) Done as  Android**/
-            [[appICE sharedInstance] discardInApp];
+            [[appICE sharedInstance] suspendInApp];
             CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
             [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
         } @catch (NSException *e) {