@purchasely/cordova-plugin-purchasely 1.1.6 → 1.2.1

package/VERSIONS.md

@@ -10,3 +10,8 @@ This file provides the underlying native SDK versions that the Cordova SDK relie
 | 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           |
+| 1.2.1   | 2.8.0       | 2.8.0           |

package/example/package-lock.json

@@ -9,15 +9,15 @@
       "version": "1.0.0",
       "license": "Apache-2.0",
       "devDependencies": {
-        "@purchasely/cordova-plugin-purchasely": "file:..",
         "cordova-android": "^10.1.1",
         "cordova-ios": "^6.2.0",
+        "cordova-plugin-purchasely": "file:..",
         "cordova-plugin-whitelist": "^1.3.5"
       }
     },
     "..": {
-      "name": "@purchasely/cordova-plugin-purchasely",
-      "version": "1.1.6",
+      "name": "cordova-plugin-purchasely",
+      "version": "1.2.0",
       "dev": true,
       "license": "ISC"
     },
@@ -67,10 +67,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@purchasely/cordova-plugin-purchasely": {
-      "resolved": "..",
-      "link": true
-    },
     "node_modules/abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -285,6 +281,10 @@
         "node": ">=10"
       }
     },
+    "node_modules/cordova-plugin-purchasely": {
+      "resolved": "..",
+      "link": true
+    },
     "node_modules/cordova-plugin-whitelist": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.5.tgz",
@@ -1200,9 +1200,6 @@
         "fastq": "^1.6.0"
       }
     },
-    "@purchasely/cordova-plugin-purchasely": {
-      "version": "file:.."
-    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -1377,6 +1374,9 @@
         "xml-escape": "^1.1.0"
       }
     },
+    "cordova-plugin-purchasely": {
+      "version": "file:.."
+    },
     "cordova-plugin-whitelist": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.5.tgz",

package/example/package.json

@@ -13,19 +13,19 @@
   "author": "Apache Cordova Team",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@purchasely/cordova-plugin-purchasely": "file:..",
     "cordova-android": "^10.1.1",
     "cordova-ios": "^6.2.0",
+    "cordova-plugin-purchasely": "file:..",
     "cordova-plugin-whitelist": "^1.3.5"
   },
   "cordova": {
     "plugins": {
       "cordova-plugin-whitelist": {},
-      "@purchasley/cordova-plugin-purchasely": {}
+      "cordova-plugin-purchasely": {}
     },
     "platforms": [
       "ios",
       "android"
     ]
   }
-}
+}

package/example/www/index.html

@@ -59,6 +59,9 @@
             <div style="margin-top: 20px;">
                 <button id="restore">Restore</button>
             </div>
+            <div style="margin-top: 20px;">
+                <button id="silentRestore">Silent restore</button>
+            </div>
             <div style="margin-top: 20px;">
                 <button id="openDeeplink">Deeplink</button>
             </div>

package/example/www/js/index.js

@@ -29,6 +29,8 @@ function onDeviceReady() {
 
 	console.log("Hi");
 
+	Purchasely.setLanguage('en')
+	
 	Purchasely.startWithAPIKey(
 		'afa96c76-1d8e-4e3c-a48f-204a3cd93a15',
 		['Google'],
@@ -46,6 +48,7 @@ function onDeviceReady() {
 	document.getElementById("presentSubscriptions").addEventListener("click", presentSubscriptions);
 	document.getElementById("purchaseWithPlanVendorId").addEventListener("click", purchaseWithPlanVendorId);
 	document.getElementById("restore").addEventListener("click", restore);
+	document.getElementById("silentRestore").addEventListener("click", silentRestore);
 	document.getElementById("processToPayment").addEventListener("click", processToPayment);
 
 }
@@ -81,6 +84,7 @@ function onPuchaselySdkReady() {
 	Purchasely.setLogLevel(Purchasely.LogLevel.DEBUG);
 
 	Purchasely.setAttribute(Purchasely.Attribute.FIREBASE_APP_INSTANCE_ID, "1");
+	Purchasely.setAttribute(Purchasely.Attribute.BATCH_INSTALLATION_ID, "testBatch1");
 
 	Purchasely.isReadyToPurchase(true);
 
@@ -151,6 +155,18 @@ function restore() {
 	);
 }
 
+function silentRestore() {
+	Purchasely.silentRestoreAllProducts(
+		(plan) => {
+			if(plan) console.log("Silent restore " + plan.vendorId);
+			else console.log("Nothing to restore");
+		},
+		(error) => {
+			console.log("Silent Restore failed " + error);
+		},
+	);
+}
+
 function openDeeplink() {
 	Purchasely.handle(
 		"purchasely://ply/presentations/CAROUSEL",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purchasely/cordova-plugin-purchasely",
-  "version": "1.1.6",
+  "version": "1.2.1",
   "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="1.1.6" 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="1.2.1" 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" />
@@ -28,7 +28,7 @@
                 <source url="https://github.com/CocoaPods/Specs.git"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="Purchasely" spec="2.7.3"/>
+                <pod name="Purchasely" spec="2.8.0"/>
             </pods>
         </podspec>
     </platform>
@@ -51,7 +51,7 @@
                 android:theme="@style/Theme.AppCompat.Light.NoActionBar">
             </activity>
         </config-file>
-        <framework src="io.purchasely:core:2.7.3" />
+        <framework src="io.purchasely:core:2.8.0" />
         <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

@@ -14,11 +14,13 @@ import org.jetbrains.annotations.Nullable;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.w3c.dom.Attr;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import io.purchasely.billing.Store;
@@ -59,9 +61,9 @@ public class PurchaselyPlugin extends CordovaPlugin {
             switch (action) {
                 case "startWithAPIKey":
                     startWithAPIKey(
-                            args.getString(0),
+                            getStringFromJson(args.getString(0)),
                             args.getJSONArray(1),
-                            args.getString(2),
+                            getStringFromJson(args.getString(2)),
                             args.getInt(3),
                             args.getBoolean(4),
                             callbackContext);
@@ -79,16 +81,19 @@ public class PurchaselyPlugin extends CordovaPlugin {
                     getAnonymousUserId(callbackContext);
                     break;
                 case "userLogin":
-                    userLogin(args.getString(0), callbackContext);
+                    userLogin(getStringFromJson(args.getString(0)), callbackContext);
                     break;
                 case "userLogout":
                     userLogout();
                     break;
+                case "setLanguage":
+                    setLanguage(getStringFromJson(args.getString(0)));
+                    break;
                 case "setLogLevel":
                     setLogLevel(args.getInt(0));
                     break;
                 case "setAttribute":
-                    setAttribute(args.getInt(0), args.getString(1));
+                    setAttribute(args.getInt(0), getStringFromJson(args.getString(1)));
                     break;
                 case "setDefaultPresentationResultHandler":
                     setDefaultPresentationResultHandler(callbackContext);
@@ -104,24 +109,24 @@ public class PurchaselyPlugin extends CordovaPlugin {
                     break;
                 case "presentPresentationWithIdentifier":
                     presentPresentationWithIdentifier(
-                        args.getString(0),
-                        args.getString(1),
+                        getStringFromJson(args.getString(0)),
+                        getStringFromJson(args.getString(1)),
                         callbackContext
                         );
                     break;
                 case "presentProductWithIdentifier":
                     presentProductWithIdentifier(
-                        args.getString(0),
-                        args.getString(1),
-                        args.getString(2),
+                        getStringFromJson(args.getString(0)),
+                        getStringFromJson(args.getString(1)),
+                        getStringFromJson(args.getString(2)),
                         callbackContext
                     );
                     break;
                 case "presentPlanWithIdentifier":
                     presentPlanWithIdentifier(
-                        args.getString(0),
-                        args.getString(1),
-                        args.getString(2),
+                        getStringFromJson(args.getString(0)),
+                        getStringFromJson(args.getString(1)),
+                        getStringFromJson(args.getString(2)),
                         callbackContext
                     );
                     break;
@@ -131,25 +136,28 @@ public class PurchaselyPlugin extends CordovaPlugin {
                 case "restoreAllProducts":
                     restoreAllProducts(callbackContext);
                     break;
+                case "silentRestoreAllProducts":
+                    restoreAllProducts(callbackContext);
+                    break;
                 case "userSubscriptions":
                     userSubscriptions(callbackContext);
                     break;
                 case "handle":
-                    handle(args.getString(0), callbackContext);
+                    handle(getStringFromJson(args.getString(0)), callbackContext);
                     break;
                 case "allProducts":
                     allProducts(callbackContext);
                     break;
                 case "productWithIdentifier":
-                    productWithIdentifier(args.getString(0), callbackContext);
+                    productWithIdentifier(getStringFromJson(args.getString(0)), callbackContext);
                     break;
                 case "planWithIdentifier":
-                    planWithIdentifier(args.getString(0), callbackContext);
+                    planWithIdentifier(getStringFromJson(args.getString(0)), callbackContext);
                     break;
                 case "purchaseWithPlanVendorId":
                     purchaseWithPlanVendorId(
-                        args.getString(0),
-                        args.getString(1),
+                        getStringFromJson(args.getString(0)),
+                        getStringFromJson(args.getString(1)),
                         callbackContext
                     );
                     break;
@@ -175,6 +183,14 @@ public class PurchaselyPlugin extends CordovaPlugin {
         return true;
     }
 
+    private String getStringFromJson(String value) {
+        if(value == null || value.equals("null") || value.isEmpty()) {
+            return null;
+        }
+
+        return value;
+    }
+
     public static void sendPurchaseResult(PLYProductViewResult result, PLYPlan plan) {
         int productViewResult = 0;
         if(result == PLYProductViewResult.PURCHASED) {
@@ -318,6 +334,14 @@ public class PurchaselyPlugin extends CordovaPlugin {
         Purchasely.setLogLevel(LogLevel.values()[logLevel]);
     }
 
+    private void setLanguage(String language) {
+        try {
+            Purchasely.setLanguage(new Locale(language));
+        } catch (Exception e) {
+            Purchasely.setLanguage(Locale.getDefault());
+        }
+    }
+
     private void isReadyToPurchase(boolean isReadyToPurchase) {
         Purchasely.setReadyToPurchase(isReadyToPurchase);
     }

package/src/ios/CDVPurchasely.m

@@ -163,6 +163,14 @@
 	}];
 }
 
+- (void)silentRestoreAllProducts:(CDVInvokedUrlCommand*)command {
+	[Purchasely silentRestoreAllProductsWithSuccess:^{
+		[self successFor:command];
+	} failure:^(NSError * _Nonnull error) {
+		[self failureFor:command resultString:error.localizedDescription];
+	}];
+}
+
 - (void)purchasedSubscription:(CDVInvokedUrlCommand*)command {
 	self.purchasedCommand = command;
 	[[NSNotificationCenter defaultCenter] addObserver:self
@@ -249,6 +257,12 @@
 - (void)close:(CDVInvokedUrlCommand*)command {
 }
 
+- (void)setLanguage:(CDVInvokedUrlCommand*)command {
+	NSString *language = [command argumentAtIndex:0];
+	NSLocale *locale = [NSLocale localeWithLocaleIdentifier:language];
+	[Purchasely setLanguageFrom:locale];
+}
+
 - (void)setLoginTappedHandler:(CDVInvokedUrlCommand*)command {
 	self.loginTappedCommand = command;
 	[Purchasely setLoginTappedHandler:^(UIViewController * _Nonnull controller, void (^ _Nonnull closedHandler)(BOOL)) {
@@ -285,8 +299,12 @@
 - (void)processToPayment:(CDVInvokedUrlCommand*)command {
 	BOOL processToPayment = [[command argumentAtIndex:0] boolValue];
 
-	[Purchasely showController:self.presentedPresentationViewController type: PLYUIControllerTypeProductPage];
-	self.authorizePurchaseHandler(processToPayment);
+	if (self.presentedPresentationViewController != nil) {
+		[Purchasely showController:self.presentedPresentationViewController type: PLYUIControllerTypeProductPage];
+		if (self.authorizePurchaseHandler != nil) {
+			self.authorizePurchaseHandler(processToPayment);
+		}
+	}
 }
 
 // Helpers

package/www/Purchasely.js

@@ -86,6 +86,10 @@ exports.restoreAllProducts = function (success, error) {
     exec(success, error, 'Purchasely', 'restoreAllProducts', []);
 };
 
+exports.silentRestoreAllProducts = function (success, error) {
+    exec(success, error, 'Purchasely', 'silentRestoreAllProducts', []);
+};
+
 exports.purchasedSubscription = function (success, error) {
     exec(success, error, 'Purchasely', 'purchasedSubscription', []);
 };
@@ -126,6 +130,10 @@ exports.userSubscriptions = function (success, error) {
     exec(success, defaultError, 'Purchasely', 'userSubscriptions', []);
 };
 
+exports.setLanguage = function (language) {
+    exec(() => {}, defaultError, 'Purchasely', 'setLanguage', [language]);
+};
+
 exports.LogLevel = {
 	DEBUG: 0,
 	INFO: 1,
@@ -136,7 +144,8 @@ exports.LogLevel = {
 exports.Attribute = {
 	AMPLITUDE_SESSION_ID: 0,
 	FIREBASE_APP_INSTANCE_ID: 1,
-	AIRSHIP_CHANNEL_ID: 2
+	AIRSHIP_CHANNEL_ID: 2,
+    BATCH_INSTALLATION_ID: 3
 }
 
 exports.PurchaseResult = {

package/src/android/.idea/runConfigurations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>