@purchasely/cordova-plugin-purchasely 4.3.0 → 4.4.0

package/example/package.json

@@ -15,8 +15,8 @@
   "devDependencies": {
     "@purchasely/cordova-plugin-puchasely-google": "file:../../purchasely-google",
     "@purchasely/cordova-plugin-purchasely": "file:..",
-    "cordova-android": "^12.0.1",
-    "cordova-ios": "^7.0.1",
+    "cordova-android": "^13.0.0",
+    "cordova-ios": "^7.1.0",
     "cordova-plugin-puchasely-google": "file:../../purchasely-google",
     "cordova-plugin-purchasely": "file:.."
   },
@@ -26,8 +26,7 @@
       "@purchasely/cordova-plugin-purchasely": {}
     },
     "platforms": [
-      "android",
-      "ios"
+      "android"
     ]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purchasely/cordova-plugin-purchasely",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "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="4.3.0" 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="4.4.0" 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" />
@@ -36,7 +36,7 @@
                 <source url="https://github.com/CocoaPods/Specs.git"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="Purchasely" spec="4.3.3"/>
+                <pod name="Purchasely" spec="4.4.2"/>
             </pods>
         </podspec>
     </platform>
@@ -61,7 +61,7 @@
                 android:theme="@style/Theme.AppCompat.Light.NoActionBar">
             </activity>
         </config-file>
-        <framework src="io.purchasely:core:4.3.3" />
+        <framework src="io.purchasely:core:4.4.2" />
         <source-file src="src/android/PurchaselyPlugin.kt" target-dir="java/cordova/plugin/purchasely" />
         <source-file src="src/android/PLYProductActivity.kt" target-dir="java/cordova/plugin/purchasely" />
         <source-file src="src/android/PLYSubscriptionsActivity.java" target-dir="src/cordova/plugin/purchasely" />

package/src/android/PLYProductActivity.kt

@@ -131,11 +131,6 @@ class PLYProductActivity : AppCompatActivity() {
         PurchaselyPlugin.productActivity = productActivity
     }
 
-    override fun onDestroy() {
-        PurchaselyPlugin.productActivity?.activity = null
-        super.onDestroy()
-    }
-
     private val callback: (PLYProductViewResult, PLYPlan?) -> Unit = { result, plan ->
         PurchaselyPlugin.sendPurchaseResult(
             result,

package/src/android/PurchaselyPlugin.kt

@@ -136,6 +136,7 @@ class PurchaselyPlugin : CordovaPlugin() {
                 "restoreAllProducts" -> restoreAllProducts(callbackContext)
                 "silentRestoreAllProducts" -> restoreAllProducts(callbackContext)
                 "userSubscriptions" -> userSubscriptions(callbackContext)
+                "userSubscriptionsHistory" -> userSubscriptionsHistory(callbackContext)
                 "isDeeplinkHandled" -> isDeeplinkHandled(
                     getStringFromJson(args.getString(0)),
                     callbackContext
@@ -539,6 +540,38 @@ class PurchaselyPlugin : CordovaPlugin() {
         )
     }
 
+    private fun userSubscriptionsHistory(callbackContext: CallbackContext) {
+        Purchasely.userSubscriptionsHistory(
+            false,
+            object : SubscriptionsListener {
+                override fun onSuccess(list: List<PLYSubscriptionData>) {
+                    val result = JSONArray()
+                    for (i in list.indices) {
+                        val data = list[i]
+                        val map = HashMap(data.toMap())
+                        map["plan"] = transformPlanToMap(data.plan)
+                        map["product"] = data.product.toMap()
+                        if (data.data.storeType == StoreType.GOOGLE_PLAY_STORE) {
+                            map["subscriptionSource"] = StoreType.GOOGLE_PLAY_STORE.ordinal
+                        } else if (data.data.storeType == StoreType.AMAZON_APP_STORE) {
+                            map["subscriptionSource"] = StoreType.AMAZON_APP_STORE.ordinal
+                        } else if (data.data.storeType == StoreType.HUAWEI_APP_GALLERY) {
+                            map["subscriptionSource"] = StoreType.HUAWEI_APP_GALLERY.ordinal
+                        } else if (data.data.storeType == StoreType.APPLE_APP_STORE) {
+                            map["subscriptionSource"] = StoreType.APPLE_APP_STORE.ordinal
+                        }
+                        result.put(JSONObject(map))
+                    }
+                    callbackContext.success(result)
+                }
+
+                override fun onFailure(throwable: Throwable) {
+                    callbackContext.error(throwable.message)
+                }
+            }
+        )
+    }
+
     private fun isDeeplinkHandled(deeplink: String?, callbackContext: CallbackContext) {
         if (deeplink == null) {
             callbackContext.error("Deeplink must not be null")

package/src/ios/CDVPurchasely.h

@@ -46,6 +46,7 @@
 - (void)productWithIdentifier:(CDVInvokedUrlCommand*)command;
 - (void)planWithIdentifier:(CDVInvokedUrlCommand*)command;
 - (void)userSubscriptions:(CDVInvokedUrlCommand*)command;
+- (void)userSubscriptionsHistory:(CDVInvokedUrlCommand*)command;
 - (void)addEventsListener:(CDVInvokedUrlCommand*)command;
 - (void)removeEventsListener:(CDVInvokedUrlCommand*)command;
 - (void)isDeeplinkHandled:(CDVInvokedUrlCommand*)command;

package/src/ios/CDVPurchasely.m

@@ -120,7 +120,7 @@
         if (isFullscreen) {
             navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
         }
-        [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
+        [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage from:nil];
     }
 }
 
@@ -146,7 +146,7 @@
         if (isFullscreen) {
             navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
         }
-        [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
+        [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage from:nil];
     }
 }
 
@@ -173,7 +173,7 @@
         if (isFullscreen) {
             navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
         }
-        [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
+        [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage from:nil];
     }
 }
 
@@ -200,7 +200,7 @@
         if (isFullscreen) {
             navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
         }
-        [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
+        [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage from:nil];
     }
 }
 
@@ -209,7 +209,7 @@
     UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:ctrl];
     ctrl.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem: UIBarButtonSystemItemDone target:navCtrl action:@selector(close)];
 
-    [Purchasely showController:navCtrl type: PLYUIControllerTypeSubscriptionList];
+    [Purchasely showController:navCtrl type: PLYUIControllerTypeSubscriptionList from:nil];
 }
 
 - (void)purchaseWithPlanVendorId:(CDVInvokedUrlCommand*)command {
@@ -346,6 +346,20 @@
     }];
 }
 
+- (void)userSubscriptionsHistory:(CDVInvokedUrlCommand*)command {
+    [Purchasely userSubscriptionsHistory:false
+                          success:^(NSArray<PLYSubscription *> * _Nullable subscriptions) {
+        NSMutableArray *result = [NSMutableArray new];
+        for (PLYSubscription *subscription in subscriptions) {
+            [result addObject:subscription.asDictionary];
+        }
+        [self successFor:command resultArray:result];
+    }
+                          failure:^(NSError * _Nonnull error) {
+        [self failureFor:command resultString:error.localizedDescription];
+    }];
+}
+
 - (void)addEventsListener:(CDVInvokedUrlCommand*)command {
     [Purchasely setEventDelegate:self];
     self.eventCommand = command;
@@ -555,7 +569,7 @@
         if (self.presentedPresentationViewController && self.shouldReopenPaywall) {
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
                 self.shouldReopenPaywall = NO;
-                [Purchasely showController:self.presentedPresentationViewController type:PLYUIControllerTypeProductPage];
+                [Purchasely showController:self.presentedPresentationViewController type:PLYUIControllerTypeProductPage from:nil];
             });
         }
     });
@@ -712,7 +726,7 @@
                 [Purchasely closeDisplayedPresentation];
                 self.presentedPresentationViewController = presentationLoaded.controller;
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-                    [Purchasely showController:presentationLoaded.controller type: PLYUIControllerTypeProductPage];
+                    [Purchasely showController:presentationLoaded.controller type: PLYUIControllerTypeProductPage from:nil];
                 });
             }
         });

package/www/Purchasely.js

@@ -5,7 +5,7 @@ var defaultError = (e) => { console.log(e); }
 exports.start = function (apiKey, stores, storekit1, userId, logLevel, runningMode, success, error) {
     var cordovaSdkVersion = cordova.define.moduleMap['cordova/plugin_list'].exports['metadata']['cordova-plugin-purchasely']
     if(!cordovaSdkVersion) {
-        cordovaSdkVersion = "4.3.0";
+        cordovaSdkVersion = "4.4.0";
     }
     exec(success, error, 'Purchasely', 'start', [apiKey, stores, storekit1, userId, logLevel, runningMode, cordovaSdkVersion]);
 };
@@ -130,6 +130,10 @@ exports.userSubscriptions = function (success, error) {
     exec(success, defaultError, 'Purchasely', 'userSubscriptions', []);
 };
 
+exports.userSubscriptionsHistory = function (success, error) {
+    exec(success, defaultError, 'Purchasely', 'userSubscriptionsHistory', []);
+};
+
 exports.setLanguage = function (language) {
     exec(() => {}, defaultError, 'Purchasely', 'setLanguage', [language]);
 };