cordova-plugin-appice 2.0.10 → 2.1.2

package/example/www/js/index.js

@@ -1,102 +1,111 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Wait for the deviceready event before using any of Cordova's device APIs.
-// See https://cordova.apache.org/docs/en/latest/cordova/events/events.html#deviceready
+
 document.addEventListener('deviceready', onDeviceReady, false);
 
+function testing(deeplink, type) {
+     var t1 = JSON.stringify(deeplink);
+     console.log("testing " + type + " " + t1)
+
+
+
+     AppICE.getDataForKey(deeplink, "cdata", function(result) {
+     navigator.notification.alert(
+              result,  // message
+              alertDismissed,         // callback
+              'For Key = cdata',            // title
+              'Done'                  // buttonName
+          );
+     });
+}
+
+function alertDismissed() {
+    // do something
+}
+
 function onDeviceReady() {
-    // Cordova is now initialized. Have fun!
+     // Cordova is now initialized. Have fun!
 
-    console.log('Running cordova-' + cordova.platformId + '@' + cordova.version);
-    document.getElementById('deviceready').classList.add('ready');
-    initializesdk();
+     console.log('Running cordova-' + cordova.platformId + '@' + cordova.version);
+     document.getElementById('deviceready').classList.add('ready');
+      document.addEventListener('pushNotificationClicked', e => { testing(e.notification, "notificationCallback") })
+    document.addEventListener('pushNotificationClicked', pushNotificationClicked);
+     initializesdk()
 }
+function pushNotificationClicked(payload, type) {
+    console.log('in testing method');
+     //var t1 = JSON.stringify(payload);
+    var newPayload = payload['payload'];
+     console.log("testing " + type);
 
-// initialize appice sdk
-//document.getElementById("initsdk").addEventListener("click", initializesdk);
-function initializesdk(){
-    var certs = [];
-        // certs = ["assets/ai_android.pem"];     this is for enabling ssl pinning if no ssl certificates pass null
-         console.log("certs : ", certs);
-         AppICE.initSdk("5bebe93c25d705690ffbc758", "9e9ec60197c8373a11ac15ce4dae80e973608ab2", "d985715d1bb48942d36d5d08de3b6a8c", "",
-                 "US",
-                "https://a.appice.io",
-              certs,
-              function (success) {
-                   console.log("init success", success);
-              }, function (error) {
-                   console.log("init Failed", error);
-              });
-
-     
-         AppICE.setSessionTimeout(1800,
-              function(success){
-                   console.log("Session success " + success);
-                   },function(error){
-                   console.log("Session Failed "+ error);
-                   }
-              );
+     AppICE.getDataForKey(newPayload, 'eurl', function(result) {
+         console.log('result getDataForKey method' + result);
+ 
+     });
 }
+// initialize appice sdk
+document.getElementById("initsdk").addEventListener("click", initializesdk);
+function initializesdk() {
+     var certs = [];
+     // certs = ["assets/ai_android.pem"];     this is for enabling ssl pinning if no ssl certificates pass null
+     console.log("certs : ", certs);
+     AppICE.initSdk("5bebe93c25d705690ffbc758", "9e9ec60197c8373a11ac15ce4dae80e973608ab2", "d985715d1bb48942d36d5d08de3b6a8c", "",
+          "US",
+          "https://a.appice.io",
+          certs,
+          function (success) {
+               console.log("init success", success);
 
 
-//set user id
-document.getElementById("userid").addEventListener("click", userid);
-function userid(){
-         const userid = ["987"];
-         AppICE.setUserId(userid,
-              function (success) {
-                   console.log("Set user id success", success);
-              }, function (error) {
-                   console.log("Set user id Failed", error);
-              });
+          }, function (error) {
+               console.log("init Failed", error);
+          });
+
+     AppICE.setSessionTimeout(1800,
+          function (success) {
+               console.log("Session success " + success);
+          }, function (error) {
+               console.log("Session Failed " + error);
+          }
+     );
 
 }
 
+//set user id
+document.getElementById("userid").addEventListener("click", userid);
+function userid() {
+     const userid = ["987"];
+
+     AppICE.registerLifeCycle(function (success) {
+          console.log("registerLifeCycle success", success);
+     }, function (error) {
+          console.log("registerLifeCycle Failed", error);
+     });
 
+}
 
 //set user details
 document.getElementById("userinfo").addEventListener("click", userinfo);
-function userinfo(){
-         AppICE.setUser("Jhon Doe", "9876543210", "a@gmail.com", function (success) {
-              console.log("Set user success",success);
-         }, function (error) {
-              console.log("Set user error",error);
-         });
+function userinfo() {
+     AppICE.setUser("Jhon Doe", "9876543210", "a@gmail.com", function (success) {
+          console.log("Set user success", success);
+     }, function (error) {
+          console.log("Set user error", error);
+     });
 }
 
-
 //get event
 document.getElementById("event").addEventListener("click", allevent);
-function allevent(){
-    console.log("inside event method");
-    var dataObj = {
-        "ClickedMenuBtn":"false",
-        "CLickedSubmitBtn":"false",
-        "AppName":"SampleApp"
-        };
-        AppICE.tagEvent("SampleApp", dataObj,
-        function(success) {
-        console.log("tagEvent success: " + JSON.stringify(success));
-        
-        }, function(error) {
-        console.error("tagEvent Error : " + error);
-        });
-}
+function allevent() {
+     console.log("inside event method");
+     var dataObj = {
+          "ClickedMenuBtn": "false",
+          "CLickedSubmitBtn": "false",
+          "AppName": "SampleApp"
+     };
+     AppICE.tagEvent("SampleApp", dataObj,
+          function (success) {
+               console.log("tagEvent success: " + JSON.stringify(success));
 
+          }, function (error) {
+               console.error("tagEvent Error : " + error);
+          });
+}

package/package.json

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

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-appice" version="2.0.10">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-appice" version="2.1.2">
     <name>AppICE</name>
     <description>AppICE Plugin for Cordova/PhoneGap</description>
     <license>Commercial</license>
@@ -39,7 +39,7 @@
 
         <podspec>
             <pods>
-                <pod name="AppICE-IOS-SDK" spec="1.7.65" />
+                <pod name="AppICE-IOS-SDK" spec="1.7.69" />
             </pods>
         </podspec>
 
@@ -113,12 +113,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.69"/>
 
 
         <!-- 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 -->
@@ -170,7 +173,7 @@
         </config-file>
 
         <!-- CLASSES PATH -->
-<!--        <source-file src="src/android/AppICEMFPPush.java" target-dir="com/appice/cordova/" />-->
+        <source-file src="src/android/AppICEPushHandler.java" target-dir="com/appice/cordova/" />
         <source-file src="src/android/AppICEPlugin.java" target-dir="com/appice/cordova/" />
         <source-file src="src/android/CampaignCampsReceiver.java" target-dir="com/appice/cordova/" />
         <source-file src="src/android/NotificationEventService.java" target-dir="com/appice/cordova/" />

package/scripts/BeforeAndroidBuilt.js

@@ -22,9 +22,10 @@ module.exports = function (context) {
 	///for SSL pinning
 
 	var appBuildGradlePath = path.join(platformRoot, 'app/build.gradle'); // Path to the app's build.gradle file
-    const pluginName = 'cordova-plugin-appice';
-    const pluginXmlPath = path.join(context.opts.projectRoot, 'plugins', pluginName, 'plugin.xml');
-    const sourceFileEntry = '<source-file src="src/android/AppICEMFPPush.java" target-dir="com/appice/cordova/" />';
+	const pluginName = 'cordova-plugin-appice';
+	const pluginXmlPath = path.join(context.opts.projectRoot, 'plugins', pluginName, 'plugin.xml');
+	const sourceFileEntry = '<source-file src="src/android/AppICEMFPPush.java" target-dir="com/appice/cordova/" />';
+	const sourceFileEntryFCM = '<source-file src="src/android/AppICEFCMPush.java" target-dir="com/appice/cordova/" />';
 
 	if (MFP_PUSH === "true") {
 		var manifestFileNew = path.join(platformRoot, '/app/src/main/AndroidManifest.xml');
@@ -44,7 +45,6 @@ module.exports = function (context) {
 								throw new Error('Unable to write into AndroidManifest.xml: ' + err);
 							}
 						});
-
 					}
 				});
 			} catch (err) {
@@ -74,20 +74,20 @@ module.exports = function (context) {
 			}
 
 			try {
-            				const pluginXmlContent = fs.readFileSync(pluginXmlPath, 'utf8');
-
-            				if (pluginXmlContent.indexOf(sourceFileEntry) === -1) {
-            					const platformPosition = pluginXmlContent.indexOf('<platform name="android">');
-            					const updatedPluginXmlContent = pluginXmlContent.slice(0, platformPosition) + '\n' + sourceFileEntry + '\n' + pluginXmlContent.slice(platformPosition);
-
-            					fs.writeFileSync(pluginXmlPath, updatedPluginXmlContent, 'utf8');
-            					console.log(`Added <source-file> entry to ${pluginXmlPath}`);
-            				} else {
-            					console.log(`<source-file> entry already exists in ${pluginXmlPath}`);
-            				}
-            			} catch (err) {
-            				console.error(`Failed to modify ${pluginXmlPath}: ${err}`);
-            			}
+				const pluginXmlContent = fs.readFileSync(pluginXmlPath, 'utf8');
+
+				if (pluginXmlContent.indexOf(sourceFileEntry) === -1) {
+					const platformPosition = pluginXmlContent.indexOf('<platform name="android">');
+					const updatedPluginXmlContent = pluginXmlContent.slice(0, platformPosition) + '\n' + sourceFileEntry + '\n' + pluginXmlContent.slice(platformPosition);
+
+					fs.writeFileSync(pluginXmlPath, updatedPluginXmlContent, 'utf8');
+					console.log(`Added <source-file> entry to ${pluginXmlPath}`);
+				} else {
+					console.log(`<source-file> entry already exists in ${pluginXmlPath}`);
+				}
+			} catch (err) {
+				console.error(`Failed to modify ${pluginXmlPath}: ${err}`);
+			}
 		} else {
 			var manifestFileNewRoot = path.join(platformRoot, 'AndroidManifest.xml');
 			if (fs.existsSync(manifestFileNewRoot)) {
@@ -105,32 +105,61 @@ module.exports = function (context) {
 									throw new Error('Unable to write into AndroidManifest.xml: ' + err);
 								}
 							});
-
 						}
 					});
 				} catch (err) {
 				}
 			}
 		}
+	} else {
 
-		if (fs.existsSync(project_properties)) {
-			try {
-				fs.readFile(project_properties, 'utf8', function (err, data) {
-					if (err) {
-						throw new Error('Unable to find project_properties: ' + err);
-					}
-					var modifiedBuildGradle = data;
-					var libmfp_prop = 'cordova.system.library.13=appice.io.android:libmfp:1.0.0'
-					//+ '\nimplementation appice.io.android:libmfp:+"'; 
-					if (data.indexOf(libmfp_prop) == -1) {
-						fs.appendFileSync(project_properties, '\n' + libmfp_prop);
-					}
-				});
+		const manifestPath = '/app/src/main/AndroidManifest.xml';
+
+		// Read existing manifest file
+		fs.readFile(manifestPath, 'utf-8', (err, data) => {
+			if (err) {
+				console.error('Error reading manifest file:', err);
+				return;
+			}
+
+			// Find the position to insert the service tag
+			const serviceIntentFilter = '        <intent-filter>\n            <action android:name="com.google.firebase.MESSAGING_EVENT" />\n        </intent-filter>\n';
+			const serviceTag = `    <service android:name="com.appice.cordova.AppICEFCMPush">\n${serviceIntentFilter}    </service>\n`;
+
+			const index = data.indexOf('</application>');
+			if (index === -1) {
+				console.error('Error: Could not find </application> tag in AndroidManifest.xml');
+				return;
 			}
-			catch (err) {
-				console.log("project_properties found :", err);
+
+			// Insert the service tag just before the </application> tag
+			const updatedManifest = data.slice(0, index) + serviceTag + data.slice(index);
+
+			// Write the updated manifest back to file
+			fs.writeFile(manifestPath, updatedManifest, 'utf-8', (err) => {
+				if (err) {
+					console.error('Error writing manifest file:', err);
+					return;
+				}
+				console.log('Firebase Cloud Messaging service tag added to AndroidManifest.xml successfully!');
+			});
+		});
+		try {
+			const pluginXmlContent = fs.readFileSync(pluginXmlPath, 'utf8');
+
+			if (pluginXmlContent.indexOf(sourceFileEntry) === -1) {
+				const platformPosition = pluginXmlContent.indexOf('<platform name="android">');
+				const updatedPluginXmlContent = pluginXmlContent.slice(0, platformPosition) + '\n' + sourceFileEntryFCM + '\n' + pluginXmlContent.slice(platformPosition);
+
+				fs.writeFileSync(pluginXmlPath, updatedPluginXmlContent, 'utf8');
+				console.log(`Added <source-file> entry to ${pluginXmlPath}`);
+			} else {
+				console.log(`<source-file> entry already exists in ${pluginXmlPath}`);
 			}
+		} catch (err) {
+			console.error(`Failed to modify ${pluginXmlPath}: ${err}`);
 		}
+
 	}
 
 	if (SSL_PINNING === "true") {

package/src/android/AppICEFCMPush.java

@@ -0,0 +1,26 @@
+package com.appice.cordova;
+
+import androidx.annotation.NonNull;
+
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+
+public class AppICEFCMPush extends FirebaseMessagingService {
+    private final AppICEPushHandler appICEPushHandler = new AppICEPushHandler();
+
+    @Override
+    public void onNewToken(@NonNull String token) {
+        super.onNewToken(token);
+        appICEPushHandler.onNewToken(token, getApplicationContext());
+    }
+
+    @Override
+    public void onMessageReceived(@NonNull RemoteMessage message) {
+        super.onMessageReceived(message);
+        if(appICEPushHandler.isAppICEPush(message)) {
+            appICEPushHandler.onMessageReceived(message, getApplicationContext());
+        }else{
+            // handle your customise push payload here
+        }
+    }
+}

package/src/android/AppICEMFPPush.java

@@ -1,55 +1,40 @@
 package com.appice.cordova;
 
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+
 import com.google.firebase.messaging.RemoteMessage;
 import com.ibm.mobilefirstplatform.clientsdk.android.push.api.MFPPushIntentService;
 import com.ibm.mobilefirstplatform.clientsdk.android.push.internal.MFPInternalPushMessage;
+
 import org.json.JSONObject;
 
 import java.util.Map;
 
-import semusi.activitysdk.ContextSdk;
-import semusi.context.utility.Utility;
-
-/* import path for MainActivity */
-
-
-/*=============================*/
-
-public class AppICEMFPPush extends MFPPushIntentService {
-    private static final String TAG = AppICEMFPPush.class.getSimpleName();
-    private static final String ACTION = "com.appice.campaignEvent";
-    private static final String PUSH_PAYLOAD = "ai_content";
-    private static final String MESSAGE = "message";
-    private static final String EXTERNAL_TYPE = "et";
-    private static final String DEEPLINK = "dl";
-    private static final String LANDING_PAGE = "lp";
+public class AppICEMFPPush extends MFPPushIntentService{
+    private static final String TAG = AppICEMFPPush.class.getName();
+    private final AppICEPushHandler appICEPushHandler = new AppICEPushHandler();
 
     @Override
     public void onMessageReceived(RemoteMessage message) {
-        if (message != null)
-            onMessageReceived(message, null, null, getApplicationContext());
-    }
-
-    public void onMessageReceived(RemoteMessage message, PendingIntent createPendingIntent, PendingIntent deletePendingIntent, Context context) {
-        Map<String, String> data = message.getData();
         MFPPushIntentService mfpPushIntentService = new MFPPushIntentService();
-        boolean isAppICEPayload = ContextSdk.isAppICENotification(message);
         int collapseId = -1;
-        JSONObject payload = null;
-
-        if (isAppICEPayload && !checkIfPayloadHaveExternalUrl(message)) {
-            ContextSdk.handleAppICEPush(message, createPendingIntent(data.get(MESSAGE), context), deletePendingIntent(context), context);
-        } else if (isAppICEPayload && checkIfPayloadHaveExternalUrl(message)) {
-            ContextSdk.handleAppICEPush(message, context);
-        } else {
-
+        if (appICEPushHandler.isAppICEPush(message)){
+            appICEPushHandler.onMessageReceived(message, getApplicationContext());
+        }else {
+
+            /*
+             *  if you have your customise code for MFP push then
+             *  you can pass this remote message to your custom class
+             *  rather calling mfpIntent directly
+             *
+             *  you can also extend your custom class
+             */
+
+            // in case if there will no custom class
+            Map<String, String> data = message.getData();
+            JSONObject payload = null;
             try {
                 JSONObject dataPayload = new JSONObject(data);
                 if (dataPayload != null) {
@@ -62,7 +47,6 @@ public class AppICEMFPPush extends MFPPushIntentService {
             } catch (Exception e) {
                 Log.e(TAG, "onMessageReceived: error ", e);
             }
-
             try {
                 if (collapseId != -1) {
                     mfpPushIntentService.onNotificationReceived(data, collapseId);
@@ -76,102 +60,8 @@ public class AppICEMFPPush extends MFPPushIntentService {
     }
 
     @Override
-    public void onNewToken(@NonNull String s) {
-        super.onNewToken(s);
-        ContextSdk.checkIfDeviceRegisterToFCM(getApplicationContext());
-    }
-
-
-    /*======================================
-    *  define your launch activity here
-    *  also do the import for that activity for ex : import com.appice.sample.MainActivity;
-    *  uncomment this try block
-    ========================================*/
-
-    public static PendingIntent createPendingIntent(String message, Context mContext) {
-        PendingIntent pendingIntent = null;
-        // uncomment this if you are using MFP service
-        // pendingIntent=  internalCreatePendingIntent(message, mContext);
-        return pendingIntent;
-    }
-
-    public static PendingIntent deletePendingIntent(Context mContext) {
-        PendingIntent pendingIntent = null;
-
-        // uncomment this if you are using MFP service
-        //pendingIntent =  internalDeletePendingIntent(mContext);
-        return pendingIntent;
-    }
-
-    //================================
-    // internal helper fucntion
-    //================================
-    private static PendingIntent internalCreatePendingIntent(String message, Context mContext){
-        try {
-            // please use your launch activity here
-            Intent clickIntent = new Intent(mContext, MainActivity.class);
-
-            final Intent newIntent = new Intent();
-            newIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            newIntent.setAction(ACTION);
-            clickIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                    | Intent.FLAG_ACTIVITY_CLEAR_TOP
-                    | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-            newIntent.putExtra(PUSH_PAYLOAD, message);
-            Utility.sendEventToListener(mContext, newIntent);
-            return PendingIntent.getActivity(
-                    mContext, 1, clickIntent, getPendingIntentFlags());
-        } catch (Throwable e) {
-            Log.e(TAG, "createPendingIntent: error ",e );
-        }
-        return null;
-    }
-
-    public static PendingIntent internalDeletePendingIntent(Context mContext) {
-        try {
-            // please use your launch activity here
-            Intent clickIntent = new Intent(mContext, MainActivity.class);
-
-            clickIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-            return PendingIntent.getActivity(mContext, 1, clickIntent,
-                    getPendingIntentFlags());
-        }catch (Throwable t){
-            Log.e(TAG, "deletePendingIntent: error ",t );
-        }
-        return null;
-    }
-
-    private static int getPendingIntentFlags(){
-        int flag;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            flag = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE;
-        } else {
-            flag = PendingIntent.FLAG_UPDATE_CURRENT;
-        }
-
-        return flag;
-    }
-
-    private boolean checkIfPayloadHaveExternalUrl(RemoteMessage message) {
-        Map<String, String> map = message.getData();
-
-        try {
-            if (map != null) {
-                String messageStr = map.get(MESSAGE);
-                if (messageStr != null && messageStr.length() > 0) {
-                    JSONObject messageObj = new JSONObject(messageStr);
-                    String type = messageObj.optString(EXTERNAL_TYPE);
-                    if (type.equalsIgnoreCase(DEEPLINK)) {
-                        return false;
-                    }
-                    if (type.equalsIgnoreCase(LANDING_PAGE)) {
-                        return true;
-                    }
-                }
-            }
-        } catch (Throwable t) {
-            Log.e(TAG, "checkIfPayloadHaveExternalUrl: error ", t);
-        }
-        return false;
+    public void onNewToken(@NonNull String token) {
+        super.onNewToken(token);
+        appICEPushHandler.onNewToken(token, getApplicationContext());
     }
-}
+}