242195 Fix app state reset on opening push notification

cordova-sdk/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@optimove-inc/cordova-sdk",
   "displayName": "Optimove Cordova plugin",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "A sample Apache Cordova application that responds to the deviceready event.",
   "scripts": {
     "build": "webpack",

cordova-sdk/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="optimove-cordova-sdk" version="2.2.1" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="optimove-cordova-sdk" version="2.2.2" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>OptimoveSDKPlugin</name>
     <js-module name="OptimoveCore" src="www/OptimoveCore.js"/>
     <js-module name="Optimove" src="www/Optimove.js">

cordova-sdk/src/android/OptimoveInitProvider.java

@@ -39,7 +39,7 @@ public class OptimoveInitProvider extends ContentProvider {
     private static final String DELAYED_INITIALIZATION_ENABLE_OPTIMOVE = "delayedInitialization.featureSet.enableOptimove";
     private static final String DELAYED_INITIALIZATION_ENABLE_OPTIMOBILE = "delayedInitialization.featureSet.enableOptimobile";
 
-    private static final String SDK_VERSION = "2.2.1";
+    private static final String SDK_VERSION = "2.2.2";
     private static final int RUNTIME_TYPE = 3;
     private static final int SDK_TYPE = 106;
 

cordova-sdk/src/android/PushReceiver.java

@@ -58,6 +58,21 @@ protected void onPushOpened(Context context, PushMessage pushMessage) {
         PushReceiver.handlePushOpen(context, pushMessage, null);
     }
 
+    @Override
+    protected Intent getPushOpenActivityIntent(Context context, PushMessage pushMessage) {
+            Intent launchIntent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+
+            if (null == launchIntent) {
+                return null;
+            }
+
+            launchIntent.putExtra(PushMessage.EXTRAS_KEY, pushMessage);
+            launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            return launchIntent;
+        }
+
+
     private static void handlePushOpen(Context context, PushMessage pushMessage, String actionId) {
         PushReceiver pr = new PushReceiver();
         Intent launchIntent = pr.getPushOpenActivityIntent(context, pushMessage);
@@ -91,22 +106,6 @@ private static void handlePushOpen(Context context, PushMessage pushMessage, Str
             addDeepLinkExtras(pushMessage, existingIntent);
         }
 
-        if (null != pushMessage.getUrl()) {
-            launchIntent = new Intent(Intent.ACTION_VIEW, pushMessage.getUrl());
-
-            addDeepLinkExtras(pushMessage, launchIntent);
-
-            TaskStackBuilder taskStackBuilder = TaskStackBuilder.create(context);
-            taskStackBuilder.addParentStack(component);
-            taskStackBuilder.addNextIntent(launchIntent);
-            taskStackBuilder.startActivities();
-        } else {
-            launchIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-
-            addDeepLinkExtras(pushMessage, launchIntent);
-
-            context.startActivity(launchIntent);
-        }
 
         if (null == OptimoveSDKPlugin.jsCallbackContext) {
             OptimoveSDKPlugin.pendingPush = pushMessage;

cordova-sdk/src/ios/OptimoveSDKPlugin.swift

@@ -24,7 +24,7 @@ enum InAppConsentStrategy: String {
     private static var pendingPush: PushNotification? = nil
     private static var pendingDdl: DeepLinkResolution? = nil
 
-    private static let sdkVersion = "2.2.1"
+    private static let sdkVersion = "2.2.2"
     private static let sdkTypeOptimoveCordova = 106
     private static let runtimeTypeCordova = 3