@purchasely/cordova-plugin-purchasely 2.2.3 → 2.2.4

package/example/package-lock.json

@@ -9,8 +9,7 @@
       "version": "1.0.0",
       "license": "Apache-2.0",
       "devDependencies": {
-        "@purchasely/cordova-plugin-purchasely": "^2.2.2",
-        "cordova-android": "^10.1.0",
+        "cordova-android": "^10.1.2",
         "cordova-ios": "^6.2.0",
         "cordova-plugin-purchasely": "file:.."
       }
@@ -67,12 +66,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@purchasely/cordova-plugin-purchasely": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@purchasely/cordova-plugin-purchasely/-/cordova-plugin-purchasely-2.2.2.tgz",
-      "integrity": "sha512-0d8Bfh2RKLU2D+kMiZ75SqeT3/5C3BaTFRFi6+cTKzrZcycjRW1nhHP1lvjoHXvaDDh9bxVMVKt2uCtTtE8xig==",
-      "dev": true
-    },
     "node_modules/abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -206,9 +199,9 @@
       "dev": true
     },
     "node_modules/cordova-android": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.0.tgz",
-      "integrity": "sha512-nkVh8VMDWoDmvWaQav/sF3Q7N9ZpRRNBJduDhjCOMwYUF/6q2526i/Jb/wJLdXmetBNh+THkGolcTBi9i+1UzA==",
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.2.tgz",
+      "integrity": "sha512-F28+NvgKO4ZhKFkqctCOh62mhVoNyUuRQh/F/nqp+Sti4ODv2rUa6UeW18khhdYTjlDeihHQsPqxvB7mI6fVYA==",
       "dev": true,
       "dependencies": {
         "android-versions": "^1.7.0",
@@ -228,9 +221,9 @@
       }
     },
     "node_modules/cordova-android/node_modules/fs-extra": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -855,7 +848,7 @@
     "node_modules/properties-parser": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz",
-      "integrity": "sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=",
+      "integrity": "sha512-AkSQxQAviJ89x4FIxOyHGfO3uund0gvYo7lfD0E+Gp7gFQKrTNgtoYQklu8EhrfHVZUzTwKGZx2r/KDSfnljcA==",
       "dev": true,
       "dependencies": {
         "string.prototype.codepointat": "^0.2.0"
@@ -1283,12 +1276,6 @@
         "fastq": "^1.6.0"
       }
     },
-    "@purchasely/cordova-plugin-purchasely": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@purchasely/cordova-plugin-purchasely/-/cordova-plugin-purchasely-2.2.2.tgz",
-      "integrity": "sha512-0d8Bfh2RKLU2D+kMiZ75SqeT3/5C3BaTFRFi6+cTKzrZcycjRW1nhHP1lvjoHXvaDDh9bxVMVKt2uCtTtE8xig==",
-      "dev": true
-    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -1392,9 +1379,9 @@
       "dev": true
     },
     "cordova-android": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.0.tgz",
-      "integrity": "sha512-nkVh8VMDWoDmvWaQav/sF3Q7N9ZpRRNBJduDhjCOMwYUF/6q2526i/Jb/wJLdXmetBNh+THkGolcTBi9i+1UzA==",
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.2.tgz",
+      "integrity": "sha512-F28+NvgKO4ZhKFkqctCOh62mhVoNyUuRQh/F/nqp+Sti4ODv2rUa6UeW18khhdYTjlDeihHQsPqxvB7mI6fVYA==",
       "dev": true,
       "requires": {
         "android-versions": "^1.7.0",
@@ -1411,9 +1398,9 @@
       },
       "dependencies": {
         "fs-extra": {
-          "version": "10.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-          "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
@@ -1895,7 +1882,7 @@
     "properties-parser": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz",
-      "integrity": "sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=",
+      "integrity": "sha512-AkSQxQAviJ89x4FIxOyHGfO3uund0gvYo7lfD0E+Gp7gFQKrTNgtoYQklu8EhrfHVZUzTwKGZx2r/KDSfnljcA==",
       "dev": true,
       "requires": {
         "string.prototype.codepointat": "^0.2.0"

package/example/package.json

@@ -13,16 +13,12 @@
   "author": "Apache Cordova Team",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@purchasely/cordova-plugin-purchasely": "^2.2.2",
-    "cordova-android": "^10.1.0",
+    "cordova-android": "^10.1.2",
     "cordova-ios": "^6.2.0",
     "cordova-plugin-purchasely": "file:.."
   },
   "cordova": {
-    "plugins": {
-      "@purchasely/cordova-plugin-purchasely": {},
-      "cordova-plugin-purchasely": {}
-    },
+    "plugins": {},
     "platforms": [
       "android"
     ]

package/example/www/js/index.js

@@ -30,7 +30,7 @@ function onDeviceReady() {
 	Purchasely.setLanguage('en')
 
 	Purchasely.startWithAPIKey(
-		'afa96c76-1d8e-4e3c-a48f-204a3cd93a15',
+		'fcb39be4-2ba4-4db7-bde3-2a5a1e20745d',
 		['Google'],
 		null,
 		Purchasely.LogLevel.DEBUG,
@@ -126,7 +126,7 @@ function onPuchaselySdkReady() {
 				result.parameters.url
 			);
 			console.log('prevent Purchasely SDK to navigate to website');
-			Purchasely.onProcessAction(false);
+			Purchasely.onProcessAction(true);
 		} else if (result.action === Purchasely.PaywallAction.close) {
 			console.log('User wants to close paywall');
 			Purchasely.onProcessAction(true);
@@ -144,7 +144,6 @@ function onPuchaselySdkReady() {
 			console.log('User wants to purchase');
 			//If you want to intercept it, close paywall and display your screen
 			Purchasely.closePaywall();
-			Purchasely.onProcessAction(true);
 		} else if (result.action === Purchasely.PaywallAction.restore) {
 			console.log('User wants to restore his purchases');
 			Purchasely.onProcessAction(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purchasely/cordova-plugin-purchasely",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Purchasely is a solution to ease the integration and boost your In-App Purchases & Subscriptions on the App Store, Google Play Store, Amazon Appstore and Huawei App Gallery.",
   "cordova": {
     "id": "@purchasely/cordova-plugin-purchasely",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@purchasely/cordova-plugin-purchasely" version="2.2.2" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="@purchasely/cordova-plugin-purchasely" version="2.2.4" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Purchasely</name>
     <js-module name="Purchasely" src="www/Purchasely.js">
         <clobbers target="Purchasely" />
@@ -51,7 +51,7 @@
                 android:theme="@style/Theme.AppCompat.Light.NoActionBar">
             </activity>
         </config-file>
-        <framework src="io.purchasely:core:3.2.1" />
+        <framework src="io.purchasely:core:3.2.2" />
         <source-file src="src/android/PurchaselyPlugin.java" target-dir="src/cordova/plugin/purchasely" />
         <source-file src="src/android/PLYProductActivity.java" target-dir="src/cordova/plugin/purchasely" />
         <source-file src="src/android/PLYSubscriptionsActivity.java" target-dir="src/cordova/plugin/purchasely" />

package/src/android/PurchaselyPlugin.java

@@ -59,7 +59,8 @@ public class PurchaselyPlugin extends CordovaPlugin {
     static CallbackContext eventsCallback = null;
     static ProductActivity productActivity = null;
 
-    private PLYProcessActionListener processActionListener;
+    @Nullable private PLYProcessActionListener processActionListener;
+    @Nullable private PLYPresentationAction paywallAction;
 
     private static int runningModeTransactionOnly = 0;
     private static int runningModeObserver = 1;
@@ -586,6 +587,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
         Purchasely.setPaywallActionsInterceptor(
                 (info, plyPresentationAction, map, plyProcessActionListener) -> {
             processActionListener = plyProcessActionListener;
+            paywallAction = plyPresentationAction;
 
             String url = null;
             if(map.getUrl() != null) {
@@ -620,7 +622,10 @@ public class PurchaselyPlugin extends CordovaPlugin {
     }
 
     private void closePaywall(CallbackContext callbackContext) {
-        Activity purchaselyActivity = productActivity.activity.get();
+        Activity purchaselyActivity = null;
+        if(productActivity != null && productActivity.activity != null) {
+            purchaselyActivity = productActivity.activity.get();
+        }
         Activity activity =  purchaselyActivity != null ? purchaselyActivity : cordova.getActivity();
         Intent intent = new Intent(activity, cordova.getActivity().getClass());
         intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
@@ -628,24 +633,40 @@ public class PurchaselyPlugin extends CordovaPlugin {
     }
 
     private void onProcessAction(boolean processAction) {
-        if(processActionListener != null) {
-            if(productActivity != null) {
-                boolean softRelaunched = productActivity.relaunch(cordova);
-                if(softRelaunched) {
+        if(processActionListener == null) return;
+
+        PLYPresentationAction action = PLYPresentationAction.CLOSE;
+        if(paywallAction != null) action = paywallAction;
+
+        switch (action) {
+            case PROMO_CODE:
+            case RESTORE:
+            case PURCHASE:
+            case LOGIN:
+            case OPEN_PRESENTATION:
+                processActionWithPaywallActivity(processAction);
+                break;
+            default:
+                cordova.getActivity().runOnUiThread(() -> processActionListener.processAction(processAction));
+        }
+    }
+
+    private void processActionWithPaywallActivity(boolean processAction) {
+        if(processActionListener == null) return;
+
+        boolean softRelaunched = productActivity != null && productActivity.relaunch(cordova);
+        if(softRelaunched) {
+            cordova.getActivity().runOnUiThread(() -> processActionListener.processAction(processAction));
+        } else {
+            new Thread(() -> {
+                try {
+                    Thread.sleep(500);
+                } catch (InterruptedException e) {
+                    Log.e("Purchasely", "process action error", e);
+                } finally {
                     cordova.getActivity().runOnUiThread(() -> processActionListener.processAction(processAction));
-                } else {
-                    new Thread(() -> {
-                        try {
-                            Thread.sleep(500);
-                        } catch (InterruptedException e) {
-                            Log.e("Purchasely", "process action error", e);
-                        } finally {
-                            cordova.getActivity().runOnUiThread(() -> processActionListener.processAction(processAction));
-                        }
-                    }).start();
                 }
-
-            }
+            }).start();
         }
     }
 
@@ -673,10 +694,15 @@ public class PurchaselyPlugin extends CordovaPlugin {
         String productId = null;
         String planId = null;
         String contentId = null;
-        WeakReference<PLYProductActivity> activity = null;
+        @Nullable WeakReference<PLYProductActivity> activity = null;
 
         public boolean relaunch(CordovaInterface cordova) {
-            PLYProductActivity backgroundActivity = activity.get();
+            PLYProductActivity backgroundActivity = null;
+
+            if(activity != null) {
+                backgroundActivity = activity.get();
+            }
+
             if(backgroundActivity != null
                 && !backgroundActivity.isFinishing()
                 && !backgroundActivity.isDestroyed()) {

package/INTERNAL

@@ -1,33 +0,0 @@
-# Purchasely-Cordova-Sources
-
-## Add plugin :
-
-`cd example/`
-
-`cordova plugin add /home/kevin/Documents/Purchasely/Cordova/Purchasely --link`
-
-
-## Add android platform :
-
-`cd example/`
-
-`cordova platform add android`
-
-`cordova run android`
-
-### Add Google-Play dependencies
-
-In folder `example/platforms/android/app` create a file called `build-extras.gradle` and add thoses lines :
-```groovy
-dependencies {
-    implementation "io.purchasely:google-play:2.5.5"
-}
-```
-
-### Troubleshot
-
-`cd example/`
-
-`cordova platform remove android`
-
-`cordova plugin remove cordova-plugin-purchasely`

package/VERSIONS.md

@@ -1,24 +0,0 @@
-This file provides the underlying native SDK versions that the Cordova SDK relies on.
-
-| Version | iOS version | Android version |
-|---------|-------------|-----------------|
-| 1.0.2   | 2.5.3       | 2.5.4           |
-| 1.0.3   | 2.5.5       | 2.5.5           |
-| 1.0.4   | 2.5.5       | 2.5.6           |
-| 1.0.5   | 2.6.0       | 2.5.6           |
-| 1.1.0   | 2.7.2       | 2.7.2           |
-| 1.1.1   | 2.7.3       | 2.7.2           |
-| 1.1.2   | 2.7.3       | 2.7.2           |
-| 1.1.3   | 2.7.3       | 2.7.2           |
-| 1.1.6   | 2.7.3       | 2.7.3           |
-| 1.1.7   | 2.7.3       | 2.7.4           |
-| 1.1.8   | 2.7.3       | 2.7.6           |
-| 1.2.0   | 2.8.0       | 2.8.0           |
-| 2.0.0   | 3.0.0       | 3.0.1           |
-| 2.0.1   | 3.0.0       | 3.0.1           |
-| 2.1.0   | 3.1.0       | 3.1.0           |
-| 2.1.1   | 3.1.0       | 3.1.0           |
-| 2.2.0   | 3.2.0       | 3.2.0           |
-| 2.2.1   | 3.2.1       | 3.2.1           |
-| 2.2.2   | 3.2.2       | 3.2.2           |
-| 2.2.3   | 3.2.3       | 3.2.2           |