cordova-plugin-appice 2.1.7 → 2.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-appice",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "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.1.7">
+    id="cordova-plugin-appice" version="2.1.9">
     <name>AppICE</name>
     <description>AppICE Plugin for Cordova/PhoneGap</description>
     <license>Commercial</license>
@@ -114,7 +114,7 @@
         <preference name="WORK_MANAGER_VERSION" default="2.7.1"/>
 
         <!-- AppICE VERSION-->
-        <preference name="APPICE_VERSION" default="2.5.87"/>
+        <preference name="APPICE_VERSION" default="2.5.88"/>
 
 
         <!-- USES PERMISSION -->

package/scripts/androidAfterPluginAdd.js

@@ -16,34 +16,6 @@ module.exports = function (context) {
 	var SSL_PINNING = appConfig.getPlatformPreference("SSL_PINNING", "android");
 	var project_properties = path.join(platformRoot, 'project.properties');
 
-	console.log("platformPreference : " + APPICE_FIREBASE_UPDATE);
-	if (APPICE_FIREBASE_UPDATE === "true") {
-		console.log("else true APPICE_FIREBASE_UPDATE : " + APPICE_FIREBASE_UPDATE);
-		var firebaseFile1 = path.join(platformRoot, '/app/src/main/java/org/apache/cordova/firebase/FirebasePluginMessagingService.java');
-		if (fs.existsSync(firebaseFile1)) {
-			try {
-				shell.rm('-Rf', firebaseFile1);
-			} catch (err) {
-			}
-		}
-
-		var modifiedFile1 = path.join(pluginsAppiceRoot, '/src/firebase/modified/android/FirebasePluginMessagingService.java');
-		try {
-			shell.cp('-f', modifiedFile1, firebaseFile1);
-		} catch (err) {
-		}
-		var firebaseFile2 = path.join(pluginsFirebaseRoot, '/src/android/FirebasePluginMessagingService.java');
-		if (fs.existsSync(firebaseFile2)) {
-			try {
-				shell.rm('-Rf', firebaseFile2);
-			} catch (err) {
-			}
-		}
-		try {
-			shell.cp('-f', modifiedFile1, firebaseFile2);
-		} catch (err) {
-		}
-	}
 	//////
 	var platformwww1 = path.join(platformRoot, '/platform_www/plugins/cordova-plugin-appice/www/AppICE.js');
 	var platformwww2 = path.join(pluginsAppiceRoot, '/www/AppICE.js');

package/scripts/androidAfterPluginRm.js

@@ -20,33 +20,6 @@ module.exports = function (context) {
 	var project_properties = path.join(platformRoot, 'project.properties');
 	var build_gradle = path.join(platformRoot, '/app/build.gradle');
 
-	var firebaseFile1 = path.join(platformRoot, '/app/src/main/java/org/apache/cordova/firebase/FirebasePluginMessagingService.java');
-	if (fs.existsSync(firebaseFile1)) {
-		try {
-			shell.rm('-Rf', firebaseFile1);
-		} catch (err) {
-		}
-	}
-
-	var modifiedFile1 = path.join(pluginsAppiceRoot, '/src/firebase/original/android/FirebasePluginMessagingService.java');
-	try {
-		shell.cp('-f', modifiedFile1, firebaseFile1);
-	} catch (err) {
-	}
-
-	var firebaseFile2 = path.join(pluginsFirebaseRoot, '/src/android/FirebasePluginMessagingService.java');
-	if (fs.existsSync(firebaseFile2)) {
-		try {
-			shell.rm('-Rf', firebaseFile2);
-		} catch (err) {
-		}
-	}
-
-	try {
-		shell.cp('-f', modifiedFile1, firebaseFile2);
-	} catch (err) {
-	}
-
 	var manifestFile = path.join(platformRoot, 'AndroidManifest.xml');
 	if (fs.existsSync(manifestFile)) {
 		try {

package/scripts/iOSAfterPluginAdd.js

@@ -23,35 +23,6 @@ module.exports = function (context) {
 	var SSL_PINNING = appConfig.getPlatformPreference("SSL_PINNING", "ios");
 
 	////SSL_PINNING
-
-	if (APPICE_FIREBASE_UPDATE === "true") {
-		console.log("inside APPICE_FIREBASE_UPDATE : " + appName);
-		var firebaseFile1 = path.join(platformRoot, '/' + appName + '/Plugins/cordova-plugin-firebasex/AppDelegate+FirebasePlugin.m');
-		if (fs.existsSync(firebaseFile1)) {
-			try {
-				shell.rm('-Rf', firebaseFile1);
-			} catch (err) {
-			}
-		}
-
-		var modifiedFile1 = path.join(pluginsAppiceRoot, '/src/firebase/modified/ios/AppDelegate+FirebasePlugin.m');
-		try {
-			shell.cp('-f', modifiedFile1, firebaseFile1);
-		} catch (err) {
-		}
-		var firebaseFile2 = path.join(pluginsFirebaseRoot, '/src/ios/AppDelegate+FirebasePlugin.m');
-		if (fs.existsSync(firebaseFile2)) {
-			try {
-				shell.rm('-Rf', firebaseFile2);
-			} catch (err) {
-			}
-		}
-		try {
-			shell.cp('-f', modifiedFile1, firebaseFile2);
-		} catch (err) {
-		}
-
-	}
 	if (SSL_PINNING === "true") {
 		console.log("appName : " + appName);
 		var get_info_plist = path.join(platformRoot, appName + '/' + appName + '-Info.plist');

package/scripts/iOSAfterPluginRm.js

@@ -17,33 +17,6 @@ module.exports = function (context) {
 	var APPICE_APPLICATIONCLASS_INCLUDE = appConfig.getPlatformPreference("APPICE_APPLICATIONCLASS_INCLUDE", "ios");
 	var SSL_PINNING = appConfig.getPlatformPreference("SSL_PINNING", "ios");
 
-	var firebaseFile1 = path.join(platformRoot, '/' + appName + '/Plugins/cordova-plugin-firebasex/AppDelegate+FirebasePlugin.m');
-	if (fs.existsSync(firebaseFile1)) {
-		try {
-			shell.rm('-Rf', firebaseFile1);
-		} catch (err) {
-		}
-	}
-
-	var modifiedFile1 = path.join(pluginsAppiceRoot, '/src/firebase/original/ios/AppDelegate+FirebasePlugin.m');
-	try {
-		shell.cp('-f', modifiedFile1, firebaseFile1);
-	} catch (err) {
-	}
-
-	var firebaseFile2 = path.join(pluginsFirebaseRoot, '/src/ios/AppDelegate+FirebasePlugin.m');
-	if (fs.existsSync(firebaseFile2)) {
-		try {
-			shell.rm('-Rf', firebaseFile2);
-		} catch (err) {
-		}
-	}
-
-	try {
-		shell.cp('-f', modifiedFile1, firebaseFile2);
-	} catch (err) {
-	}
-
 	if (SSL_PINNING === "true") {
 		console.log("appName : " + appName);
 		var get_info_plist = path.join(platformRoot, appName + '/' + appName + '-Info.plist');

package/src/android/AppICEPlugin.java

@@ -1,5 +1,7 @@
 package com.appice.cordova;
 
+import static com.appice.cordova.AppICEPushHandler.handleLandingPage;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -34,8 +36,8 @@ 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 semusi.model.user.User;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
@@ -115,20 +117,24 @@ public class AppICEPlugin extends CordovaPlugin {
                 boolean isPushNotification = (payload != null && payload.length() > 0) ? true : false;
                 if (isPushNotification) {
                     JSONObject data = new JSONObject(payload);
-
-                    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('pushNotificationClicked'," + json + ");");
-                            }
-                        });
+                    String notificationType = data.optString("et");
+                    if (Utility.isValidObject(notificationType) && notificationType.equalsIgnoreCase("lp")) {
+                        String url =  data.optString("eurl");
+                        handleLandingPage(url, cordova.getActivity().getApplicationContext());
                     } else {
-                        storeTempData(CALLBACK_CONSTANTS, json, cordova.getActivity());
+                        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('pushNotificationClicked'," + json + ");");
+                                }
+                            });
+                        } else {
+                            storeTempData(CALLBACK_CONSTANTS, json, cordova.getActivity());
+                        }
                     }
-
                     ContextSdk.pushNotificationClicked(payload, cordova.getActivity().getApplicationContext());
                 }
             }

package/src/android/AppICEPushHandler.java

@@ -1,25 +1,25 @@
 package com.appice.cordova;
 
+import android.annotation.SuppressLint;
 import android.app.PendingIntent;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 
+import com.appice.sample.MainActivity;
 import com.google.firebase.messaging.RemoteMessage;
 
-import org.json.JSONObject;
-
-import java.util.List;
 import java.util.Map;
 
 import semusi.activitysdk.ContextSdk;
-import semusi.context.utility.Utility;
 
 /* import path for MainActivity */
 
@@ -31,17 +31,22 @@ public class AppICEPushHandler {
     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 static Class<?> getActivityClass(Context context){
+        Class<?> launcherActivity = getLauncherActivityClass(context);
+        if (launcherActivity == null){
+            // please import and use your launch activity here and uncomment the below line
+            // launcherActivity = MainActivity.class;
+        }
+        return launcherActivity;
+    }
 
     public void onMessageReceived(RemoteMessage message, Context context) {
         Map<String, String> data = message.getData();
 
-        if (isAppICEPush(message) && !checkIfPayloadHaveExternalUrl(message)) {
+        if (isAppICEPush(message) ) {
+            System.out.println("data coming "+message.getData());
             ContextSdk.handleAppICEPush(message, createPendingIntent(data.get(MESSAGE), context), deletePendingIntent(context), context);
-        } else if (isAppICEPush(message) && checkIfPayloadHaveExternalUrl(message)) {
-            ContextSdk.handleAppICEPush(message, context);
         }
     }
 
@@ -70,25 +75,19 @@ public class AppICEPushHandler {
     //================================
     private static PendingIntent internalCreatePendingIntent(String message, Context mContext) {
         try {
-            Class<?> launcherActivityClass = getLauncherActivityClass(mContext);
-            if (launcherActivityClass == null) {
-                // please use your launch activity here for example
-                // launcherActivityClass = MainActivity.class;
-            }
-            Intent clickIntent = new Intent(mContext, launcherActivityClass);
+            int code  = (int) System.currentTimeMillis();
+            Intent clickIntent = new Intent(mContext, getActivityClass(mContext));
             Bundle bundle = new Bundle();
             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);
+            clickIntent.addFlags( Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
             newIntent.putExtra(PUSH_PAYLOAD, message);
             bundle.putString(PUSH_PAYLOAD, message);
             clickIntent.putExtras(bundle);
 
-          //  Utility.sendEventToListener(mContext, newIntent);
+            //  Utility.sendEventToListener(mContext, newIntent);
             return PendingIntent.getActivity(
-                    mContext, 1, clickIntent, getPendingIntentFlags());
+                    mContext, code, clickIntent, getPendingIntentFlags());
         } catch (Throwable e) {
             Log.e(TAG, "createPendingIntent: error ", e);
         }
@@ -97,10 +96,15 @@ public class AppICEPushHandler {
 
     public static PendingIntent internalDeletePendingIntent(Context mContext) {
         try {
-            // please use your launch activity here
-            Intent clickIntent = new Intent(mContext, CampaignCampsReceiver.class);
-            return PendingIntent.getBroadcast(mContext, 1, clickIntent,
-                    getPendingIntentFlags());
+            int code  = (int) System.currentTimeMillis();
+            Intent clickIntent = new Intent(mContext, getActivityClass(mContext));
+            Bundle bundle = new Bundle();
+            bundle.putBoolean("delete", true);
+            clickIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); // Use NEW_TASK to isolate tasks
+            clickIntent.putExtras(bundle);
+
+            return PendingIntent.getBroadcast(mContext, code, clickIntent,
+                    getPendingIntentFlags()| PendingIntent.FLAG_ONE_SHOT);
         } catch (Throwable t) {
             Log.e(TAG, "deletePendingIntent: error ", t);
         }
@@ -118,44 +122,42 @@ public class AppICEPushHandler {
         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;
-    }
-
     private static Class<?> getLauncherActivityClass(Context context) {
-        PackageManager packageManager = context.getPackageManager();
-        Intent intent = new Intent(Intent.ACTION_MAIN);
-        intent.addCategory(Intent.CATEGORY_LAUNCHER);
-        ResolveInfo resolveInfo = packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
+        // Get the launcher activity name dynamically
+        PackageManager pm = context.getPackageManager();
+        Intent launchIntent = new Intent(Intent.ACTION_MAIN);
+        launchIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+        launchIntent.setPackage(context.getPackageName());
+
+        ResolveInfo resolveInfo = pm.resolveActivity(launchIntent, PackageManager.MATCH_DEFAULT_ONLY);
 
         if (resolveInfo != null && resolveInfo.activityInfo != null) {
-            String className = resolveInfo.activityInfo.name;
+            String launcherActivityName = resolveInfo.activityInfo.name;
             try {
-                return Class.forName(className);
+                return Class.forName(launcherActivityName);
             } catch (Throwable e) {
-                Log.e(TAG, "getLauncherActivityClass: error ", e);
+                System.out.println("getLauncherActivityClass: error "+e);
             }
+        } else {
+            System.out.println("Launcher activity not found.");
         }
-
         return null;
     }
+
+    public static void handleLandingPage(String url, Context context){
+        try {
+            if (!url.startsWith("http://") && !url.startsWith("https://")) {
+                url = "https://" + url;
+            }
+        } catch (Throwable e) {
+            System.out.println("handleLandingPage check if any error with prefix "+e);
+        }
+        try {
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(intent);
+        } catch (Throwable e) {
+            System.out.println("handleLandingPage check if any error with intent "+e);
+        }
+    }
 }

package/www/AppICE.js

@@ -249,7 +249,7 @@ cordova.define("cordova-plugin-appice.AppICE", function (require, exports, modul
               success(parsedPayload.cdata[key]);
           }
 
-          error('something is wrong please try again with valid data');
+         // error('something is wrong please try again with valid data');
     } catch (errMessage) {
       error(errMessage)
     }