cordova-plugin-appice 2.1.8 → 2.2.0

package/example/www/js/index.js

@@ -23,12 +23,13 @@ function alertDismissed() {
 
 function onDeviceReady() {
      // Cordova is now initialized. Have fun!
-
+     onResume()
      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');
@@ -41,6 +42,34 @@ function pushNotificationClicked(payload, type) {
  
      });
 }
+
+//isDeviceReady
+document.addEventListener('resume', onResume, false);
+// Function to handle app resuming to foreground
+function onResume() {
+    console.log('Deeplink Push : App is now in the foreground');
+    // Handle tasks needed when app comes back to the foreground
+    AppICE.isDeviceReady(true,
+        function(success) {
+        console.log('Deeplink Push STATE 4: App is active, isDeviceReady success:', success);
+    },
+        function(error) { console.log('Deeplink Push STATE 4: App is active, isDeviceReady error:', error); }
+    );
+   
+}
+
+document.addEventListener('pause', onPause, false);
+// Function to handle app going to background
+function onPause() {
+    console.log('Deeplink Push : App is now in the background');
+    // Here you can handle any tasks needed when app goes to the background
+    AppICE.isDeviceReady(false,
+        function(success) { console.log('Deeplink Push : App is inactive, isDeviceReady success:', success); },
+        function(error) { console.log('Deeplink Push : App is inactive, isDeviceReady error:', error); }
+    );
+}
+
+
 // initialize appice sdk
 document.getElementById("initsdk").addEventListener("click", initializesdk);
 function initializesdk() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-appice",
-  "version": "2.1.8",
+  "version": "2.2.0",
   "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.8">
+    id="cordova-plugin-appice" version="2.2.0">
     <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.88"/>
+        <preference name="APPICE_VERSION" default="2.5.90"/>
 
 
         <!-- USES PERMISSION -->
@@ -126,14 +126,18 @@
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
             <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
 
-            <service android:name="semusi.activitysdk.Api" android:exported="false" android:protectionLevel="signature"/>
+            <service android:name="semusi.activitysdk.Api"
+                android:exported="false" android:protectionLevel="signature"/>
 
-            <receiver android:name="com.appice.cordova.CampaignCampsReceiver" android:exported="false" android:protectionLevel="signature">
+            <receiver android:name="com.appice.cordova.CampaignCampsReceiver"
+                android:exported="false" android:protectionLevel="signature">
                 <intent-filter>
                     <action android:name="com.appice.campaignEvent" />
                 </intent-filter>
             </receiver>
-            <service android:name="com.appice.cordova.NotificationEventService" android:exported="false" android:permission="android.permission.BIND_JOB_SERVICE">
+            <service android:name="com.appice.cordova.NotificationEventService"
+                android:protectionLevel="signature"
+                android:exported="false" android:permission="android.permission.BIND_JOB_SERVICE">
                 <intent-filter>
                     <action android:name="com.appice.campaignEvent" />
                 </intent-filter>
@@ -141,7 +145,8 @@
 
             <activity android:name="semusi.context.ui.UIEventsHandler" android:exported="false" android:protectionLevel="signature" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
 
-            <activity android:name="semusi.context.ui.AppICENotifUI" android:exported="false">
+            <activity android:name="semusi.context.ui.AppICENotifUI"
+                android:protectionLevel="signature" android:exported="false">
                 <intent-filter>
                     <action android:name="AppICE.Notification.FCM_Action"/>
                     <category android:name="android.intent.category.DEFAULT"/>
@@ -157,13 +162,17 @@
                 </intent-filter>
             </activity>
 
-            <service android:name="semusi.ruleengine.pushmanager.SdkFcmListenerService" android:exported="false" android:protectionLevel="signature">
+            <service android:name="semusi.ruleengine.pushmanager.SdkFcmListenerService"
+                android:exported="false" android:protectionLevel="signature">
                 <intent-filter>
                     <action android:name="com.google.firebase.MESSAGING_EVENT"/>
                 </intent-filter>
             </service>
 
-            <service android:exported="false" android:name="semusi.ruleengine.pushmanager.NotificationEventService" android:permission="android.permission.BIND_JOB_SERVICE">
+            <service android:exported="false"
+                android:protectionLevel="signature"
+                android:name="semusi.ruleengine.pushmanager.NotificationEventService"
+                android:permission="android.permission.BIND_JOB_SERVICE">
             </service>
         </config-file>
 

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/AppICEPushHandler.java

@@ -14,7 +14,6 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
-import com.appice.sample.MainActivity;
 import com.google.firebase.messaging.RemoteMessage;
 
 import java.util.Map;

package/src/ios/AppDelegate+AppICEPlugin.m

@@ -198,10 +198,10 @@ static OriginalImpType originalImp;
     
     @try {
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-            [NSThread sleepForTimeInterval:2.0f];
+            //[NSThread sleepForTimeInterval:2.0f];
             dispatch_async(dispatch_get_main_queue(), ^{
                 NSDictionary *userInfo = response.notification.request.content.userInfo;
-                NSLog(@"inside swizzledidresponse %@",userInfo);
+                NSLog(@"Deeplink Push : STATE 1 inside swizzledidresponse %@",userInfo);
                 BOOL appIceServer = [[appICE sharedInstance] isAppICENotification:userInfo];
                 if(appIceServer)
                 {

package/src/ios/AppICEPlugin.m

@@ -33,6 +33,9 @@ static NSInteger const kNotificationStackSize = 10;
 @synthesize notificationCallbackId; // Manages the callback ID for notifications.
 @synthesize notificationStack;     // Stack to hold pending notifications.
 
+static BOOL isAppInitialized = NO;
+static NSDictionary *pendingDeeplink = nil;
+
 
 
 +(void)load {
@@ -158,30 +161,27 @@ static NSInteger const kNotificationStackSize = 10;
 -(void)onHandleNotificationUResponse:(NSDictionary *)userInfo {
     @try {
         NSLog(@"appice - uresponse : %@",userInfo);
-       
-       
-        
+
         if (userInfo != nil && userInfo.count >0){
-          
-            [[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];
+            if (!isAppInitialized) {
+                NSLog(@"Deeplink Push : STATE 2 App not initialized, storing deeplink for later processing");
+                [self storePendingDeeplink: userInfo];
+            } else {
+                NSLog(@"Deeplink Push :STATE 2 App is initialized storePendingDeeplin and processPendingDeeplink deeplink immediately");
+                [self storePendingDeeplink:userInfo];
+                [self processPendingDeeplink];
+            }
+ 
         }
-
+        
     } @catch (NSException *exception) {
-        NSLog(@"appice - uresponse : %@",exception.description);
+        NSLog(@"appice - uresponse exception : %@",exception.description);
     } @finally {
         
     }
 }
+
 -(id)sendRequestWithURL:(NSString*)url withPostData:(NSString*)post postType:(BOOL)type {
     return [self initWithURL:url withPostData:post withPostType:type];
 }
@@ -1084,12 +1084,87 @@ 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];
+/*----------------------------------------------------------------------------
+ isDeviceReady
+ * Check if App is Ready and process the pending deeplink
+ -----------------------------------------------------------------------------*/
+- (void)isDeviceReady:(CDVInvokedUrlCommand *)command {
+    NSLog(@"Deeplink Push : STATE 3 processPendingDeeplink command %@", command);
+    
+    CDVPluginResult *pluginResult;
+    
+    // Check if the arguments array contains a valid boolean
+    if (command.arguments.count > 0 && [command.arguments[0] isKindOfClass:[NSNumber class]]) {
+        BOOL isActive = [command.arguments[0] boolValue];
+        NSLog(@"Deeplink Push : isDeviceReady called with isActive: %d", isActive);
+        
+        if (isActive) {
+            // Perform actions for active state
+            isAppInitialized = YES;
+            [self processPendingDeeplink];
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:@"Device is active"];
+        } else {
+            // Perform actions for inactive state
+            isAppInitialized = NO;
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:@"Device is inactive"];
+        }
+    } else {
+        NSLog(@"Deeplink Push : isDeviceReady called with no arguments or invalid argument type");
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"No valid argument provided"];
+    }
+    
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
+
+// Method to handle pending deeplink once app is initialized
+- (void)processPendingDeeplink {
+    @try {
+        NSLog(@"Deeplink Push STATE 4: processPendingDeeplink called, isAppInitialized: %d, pendingDeeplink: %@", isAppInitialized, pendingDeeplink);
+        if (isAppInitialized && pendingDeeplink) {
+            NSLog(@"Deeplink Push : STATE 4 handled stored data");
+            [[appICE sharedInstance] handleClickOnPush:userInfo OpenDeepLink:YES];
+            [self eventClickedPayload:pendingDeeplink];
+            
+            pendingDeeplink = nil;
+        }
+    } @catch (NSException *exception) {
+        NSLog(@"Deeplink Push :  processPendingDeeplink exception %@", exception);
+    } @finally {
+        pendingDeeplink = nil;
+        NSLog(@"Deeplink Push : finally processPendingDeeplink pendingDeeplink set to nil");
+    }
+}
+
+/*----------------------------------------------------------------------------
+ storePendingDeeplink
+ * @param userInfo - NSDictionary
+ * Store the pending deeplink info in the static variable for later processing
+ -----------------------------------------------------------------------------*/
+- (void)storePendingDeeplink:(NSDictionary *)userInfo {
+    @try {
+        // Store the pending deeplink info in the static variable for later processing
+        pendingDeeplink = userInfo;
+        NSLog(@"Deeplink Push STATE: storePendingDeeplink called" );
+    } @catch (NSException *exception) {
+        NSLog(@"Deeplink Push STATE : storePendingDeeplink exception %@",exception);
+    }
+}
+
+- (void)eventClickedPayload:(NSDictionary *)userInfo {
+    
+    NSDictionary *pushPayload = [userInfo valueForKeyPath:@"data.message"];
+    NSData *payloadData = [NSJSONSerialization dataWithJSONObject:pushPayload
+                                                          options:kNilOptions
+                                                            error:nil];
+    NSString *payloadString = [[NSString alloc] initWithData:payloadData encoding:NSUTF8StringEncoding];
+    NSLog(@"Deeplink Push :payloadString string: %@", payloadString);
+    
+    NSString *js = [NSString stringWithFormat:@"pushNotificationClicked({'payload':'%@'});",payloadString];
+    [self.commandDelegate evalJs:js];
+}
+
+
 @end
 
 

package/www/AppICE.js

@@ -67,9 +67,22 @@ 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", []);
-  };
+  /*===========================
+    isDeviceReady
+   =============================
+     * isActive is to check the App state is Resumed or Paused based on that we are handling deeplink
+       if Resumed: isAppInitialized is set YES , process pendingPayload.
+       if Paused: isAppInitialized is set No. */
+
+  AppICE.prototype.isDeviceReady = function (isActive, success, error) {
+    if (cordova.platformId === 'ios') {
+    // Pass the isActive parameter for iOS
+        cordova.exec(success, error, "AppICEPlugin", "isDeviceReady", [isActive]);
+    } else {
+    // Do not pass the isActive parameter for Android
+        cordova.exec(success, error, "AppICEPlugin", "isDeviceReady", []);
+    }
+ };
 
   //==================================
   // PLAY STORE SETTING APIS