@purchasely/cordova-plugin-purchasely 1.1.7 → 2.0.1

package/src/android/PurchaselyPlugin.java

@@ -5,6 +5,9 @@ import android.content.Intent;
 import android.net.Uri;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
+
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaInterface;
 import org.apache.cordova.CordovaPlugin;
@@ -14,21 +17,27 @@ 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.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.function.BiConsumer;
 
 import io.purchasely.billing.Store;
 import io.purchasely.ext.Attribute;
-import io.purchasely.ext.ContinuePurchaseListener;
 import io.purchasely.ext.DistributionType;
 import io.purchasely.ext.LogLevel;
-import io.purchasely.ext.LoginClosedListener;
 import io.purchasely.ext.PLYAppTechnology;
+import io.purchasely.ext.PLYPaywallActionListener;
+import io.purchasely.ext.PLYPresentationAction;
+import io.purchasely.ext.PLYProcessActionListener;
 import io.purchasely.ext.PLYProductViewResult;
+import io.purchasely.ext.PLYRunningMode;
 import io.purchasely.ext.PlanListener;
 import io.purchasely.ext.ProductListener;
 import io.purchasely.ext.ProductsListener;
@@ -50,8 +59,13 @@ public class PurchaselyPlugin extends CordovaPlugin {
     static CallbackContext eventsCallback = null;
     static ProductActivity productActivity = null;
 
-    private LoginClosedListener loginClosedListener = null;
-    private ContinuePurchaseListener continuePurchaseListener = null;
+    private PLYProcessActionListener processActionListener;
+
+    private static int runningModeTransactionOnly = 0;
+    private static int runningModeObserver = 1;
+    private static int runningModePaywallOnly = 2;
+    private static int runningModePaywallObserver = 3;
+    private static int runningModeFull = 4;
 
     @Override
     public boolean execute(String action, JSONArray args, CallbackContext callbackContext) {
@@ -63,7 +77,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
                             args.getJSONArray(1),
                             args.getString(2),
                             args.getInt(3),
-                            args.getBoolean(4),
+                            args.getInt(4),
                             callbackContext);
                     break;
                 case "close":
@@ -84,6 +98,9 @@ public class PurchaselyPlugin extends CordovaPlugin {
                 case "userLogout":
                     userLogout();
                     break;
+                case "setLanguage":
+                    setLanguage(args.getString(0));
+                    break;
                 case "setLogLevel":
                     setLogLevel(args.getInt(0));
                     break;
@@ -106,6 +123,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
                     presentPresentationWithIdentifier(
                         args.getString(0),
                         args.getString(1),
+                        args.getBoolean(2),
                         callbackContext
                         );
                     break;
@@ -114,6 +132,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
                         args.getString(0),
                         args.getString(1),
                         args.getString(2),
+                        args.getBoolean(3),
                         callbackContext
                     );
                     break;
@@ -122,6 +141,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
                         args.getString(0),
                         args.getString(1),
                         args.getString(2),
+                        args.getBoolean(3),
                         callbackContext
                     );
                     break;
@@ -131,6 +151,9 @@ public class PurchaselyPlugin extends CordovaPlugin {
                 case "restoreAllProducts":
                     restoreAllProducts(callbackContext);
                     break;
+                case "silentRestoreAllProducts":
+                    restoreAllProducts(callbackContext);
+                    break;
                 case "userSubscriptions":
                     userSubscriptions(callbackContext);
                     break;
@@ -153,17 +176,14 @@ public class PurchaselyPlugin extends CordovaPlugin {
                         callbackContext
                     );
                     break;
-                case "setLoginTappedHandler":
-                    setLoginTappedHandler(callbackContext);
+                case "setPaywallActionInterceptor":
+                    setPaywallActionInterceptor(callbackContext);
                     break;
-                case "onUserLoggedIn":
-                    onUserLoggedIn(args.getBoolean(0));
+                case "onProcessAction":
+                    onProcessAction(args.getBoolean(0));
                     break;
-                case "setConfirmPurchaseHandler":
-                    setConfirmPurchaseHandler(callbackContext);
-                    break;
-                case "processToPayment":
-                    processToPayment(args.getBoolean(0));
+                case "closePaywall":
+                    closePaywall(callbackContext);
                     break;
                 default:
                     return false;
@@ -203,7 +223,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
                                  JSONArray stores,
                                  String userId,
                                  int logLevel,
-                                 boolean observerMode,
+                                 int runningMode,
                                  CallbackContext callbackContext) {
         ArrayList<String> list = new ArrayList<>();
         for (int i=0; i< stores.length(); i++) {
@@ -215,11 +235,17 @@ public class PurchaselyPlugin extends CordovaPlugin {
         }
         ArrayList<Store> storesInstances = getStoresInstances(list);
 
+        PLYRunningMode plyRunningMode = PLYRunningMode.Full.INSTANCE;
+        if(runningMode == runningModeTransactionOnly) plyRunningMode = PLYRunningMode.TransactionOnly.INSTANCE;
+        else if(runningMode == runningModeObserver) plyRunningMode = PLYRunningMode.Observer.INSTANCE;
+        else if(runningMode == runningModePaywallOnly) plyRunningMode = PLYRunningMode.PaywallOnly.INSTANCE;
+        else if(runningMode == runningModePaywallObserver) plyRunningMode = PLYRunningMode.PaywallObserver.INSTANCE;
+
         new Purchasely.Builder(cordova.getContext())
                 .apiKey(apiKey)
                 .stores(storesInstances)
                 .userId(userId)
-                .observerMode(observerMode)
+                .runningMode(plyRunningMode)
                 .logLevel(LogLevel.values()[logLevel])
                 .build();
 
@@ -267,8 +293,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
     private void close() {
         defaultCallback = null;
         presentationCallback = null;
-        loginClosedListener = null;
-        continuePurchaseListener = null;
+        processActionListener = null;
         productActivity = null;
         Purchasely.close();
     }
@@ -318,6 +343,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);
     }
@@ -346,36 +379,42 @@ public class PurchaselyPlugin extends CordovaPlugin {
     }
 
     private void presentPresentationWithIdentifier(String presentationVendorId,
-                                                    String contentId,
+                                                   String contentId,
+                                                   boolean isFullScreen,
                                                    CallbackContext callbackContext) {
         presentationCallback = callbackContext;
         Intent intent = PLYProductActivity.newIntent(cordova.getActivity());
         intent.putExtra("presentationId", presentationVendorId);
         intent.putExtra("contentId", contentId);
+        intent.putExtra("isFullScreen", isFullScreen);
         cordova.getActivity().startActivity(intent);
     }
 
     private void presentProductWithIdentifier(String productVendorId,
                                               String presentationVendorId,
                                               String contentId,
+                                              boolean isFullScreen,
                                               CallbackContext callbackContext) {
         presentationCallback = callbackContext;
         Intent intent = PLYProductActivity.newIntent(cordova.getActivity());
         intent.putExtra("presentationId", presentationVendorId);
         intent.putExtra("productId", productVendorId);
         intent.putExtra("contentId", contentId);
+        intent.putExtra("isFullScreen", isFullScreen);
         cordova.getActivity().startActivity(intent);
     }
 
     private void presentPlanWithIdentifier(String planVendorId,
                                           String presentationVendorId,
                                           String contentId,
+                                          boolean isFullScreen,
                                           CallbackContext callbackContext) {
         presentationCallback = callbackContext;
         Intent intent = PLYProductActivity.newIntent(cordova.getActivity());
         intent.putExtra("presentationId", presentationVendorId);
         intent.putExtra("planId", planVendorId);
         intent.putExtra("contentId", contentId);
+        intent.putExtra("isFullScreen", isFullScreen);
         cordova.getActivity().startActivity(intent);
     }
 
@@ -453,7 +492,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
     }
 
     private void productWithIdentifier(String vendorId, CallbackContext callbackContext) {
-        Purchasely.getProduct(vendorId, new ProductListener() {
+        Purchasely.product(vendorId, new ProductListener() {
             @Override
             public void onSuccess(@Nullable PLYProduct plyProduct) {
                 if(plyProduct != null) {
@@ -471,7 +510,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
     }
 
     private void planWithIdentifier(String vendorId, CallbackContext callbackContext) {
-        Purchasely.getPlan(vendorId, new PlanListener() {
+        Purchasely.plan(vendorId, new PlanListener() {
             @Override
             public void onSuccess(@Nullable PLYPlan plyPlan) {
                 if(plyPlan != null) {
@@ -489,7 +528,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
     }
 
     private void purchaseWithPlanVendorId(String planVendorId, String contentId, CallbackContext callbackContext) {
-        Purchasely.getPlan(planVendorId, new PlanListener() {
+        Purchasely.plan(planVendorId, new PlanListener() {
             @Override
             public void onSuccess(@Nullable PLYPlan plyPlan) {
                 if(plyPlan != null) {
@@ -512,53 +551,57 @@ public class PurchaselyPlugin extends CordovaPlugin {
         });
     }
 
-    private void setLoginTappedHandler(CallbackContext callbackContext) {
-        Purchasely.setLoginTappedHandler((fragmentActivity, loginClosedListener) -> {
-            this.loginClosedListener = loginClosedListener;
-            Intent intent = new Intent(fragmentActivity, cordova.getActivity().getClass());
-            intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-            cordova.getActivity().startActivity(intent);
+    private void setPaywallActionInterceptor(CallbackContext callbackContext) {
+        Purchasely.setPaywallActionsInterceptor(
+                (info, plyPresentationAction, map, plyProcessActionListener) -> {
+            processActionListener = plyProcessActionListener;
 
-            PluginResult result = new PluginResult(PluginResult.Status.OK);
-            result.setKeepCallback(true);
-            callbackContext.sendPluginResult(result);
-        });
-    }
+            HashMap<String, Object> parametersForCordova = new HashMap<>();
+            parametersForCordova.put("title", map.getTitle());
+            parametersForCordova.put("url", map.getUrl());
+            parametersForCordova.put("plan", transformPlanToMap(map.getPlan()));
+            parametersForCordova.put("presentation", map.getPresentation());
 
-    private void onUserLoggedIn(boolean userLoggedIn) {
-        if(loginClosedListener != null)  {
-            if(productActivity != null) productActivity.relaunch(cordova);
-            cordova.getActivity().runOnUiThread(() -> loginClosedListener.userLoggedIn(userLoggedIn));
-        }
-    }
+            HashMap<String, Object> infoMap = new HashMap<>();
+            if(info.getContentId() != null) infoMap.put("contentId", info.getContentId());
+            if(info.getPresentationId() != null) infoMap.put("presentationId", info.getPresentationId());
 
-    private void setConfirmPurchaseHandler(CallbackContext callbackContext) {
-        Purchasely.setConfirmPurchaseHandler((fragmentActivity, continuePurchaseListener) -> {
-            this.continuePurchaseListener = continuePurchaseListener;
-            Intent intent = new Intent(fragmentActivity, cordova.getActivity().getClass());
-            intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-            cordova.getActivity().startActivity(intent);
+            HashMap<String, Object> resultForCordova = new HashMap<>();
+            resultForCordova.put("info", infoMap);
+            resultForCordova.put("action", plyPresentationAction.getValue());
+            resultForCordova.put("parameters", parametersForCordova);
 
-            PluginResult result = new PluginResult(PluginResult.Status.OK);
+            PluginResult result = new PluginResult(
+                    PluginResult.Status.OK,
+                    new JSONObject(resultForCordova)
+            );
             result.setKeepCallback(true);
             callbackContext.sendPluginResult(result);
         });
     }
 
-    private void processToPayment(boolean continueToPayment) {
-        if(continuePurchaseListener != null) {
+    private void closePaywall(CallbackContext callbackContext) {
+        Activity 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);
+        cordova.getActivity().startActivity(intent);
+    }
+
+    private void onProcessAction(boolean processAction) {
+        if(processActionListener != null) {
             if(productActivity != null) {
                 boolean softRelaunched = productActivity.relaunch(cordova);
                 if(softRelaunched) {
-                    cordova.getActivity().runOnUiThread(() -> continuePurchaseListener.processToPayment(continueToPayment));
+                    cordova.getActivity().runOnUiThread(() -> processActionListener.processAction(processAction));
                 } else {
                     new Thread(() -> {
                         try {
                             Thread.sleep(500);
                         } catch (InterruptedException e) {
-                            Log.e("Purchasely", "process to payment error", e);
+                            Log.e("Purchasely", "process action error", e);
                         } finally {
-                            cordova.getActivity().runOnUiThread(() -> continuePurchaseListener.processToPayment(continueToPayment));
+                            cordova.getActivity().runOnUiThread(() -> processActionListener.processAction(processAction));
                         }
                     }).start();
                 }

package/src/android/theme_purchasely_fullscreen.xml

@@ -0,0 +1,6 @@
+<resources>
+    <style name="Theme.Purchasely.Fullscreen" parent="Theme.AppCompat.Light.NoActionBar">
+      <item name="android:navigationBarColor">@android:color/transparent</item>
+      <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>

package/src/android/theme_purchasely_fullscreen_v23.xml

@@ -0,0 +1,6 @@
+<resources>
+    <style name="Theme.Purchasely.Fullscreen" parent="Theme.AppCompat.Light.NoActionBar">
+      <item name="android:navigationBarColor">@android:color/transparent</item>
+      <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>

package/src/android/theme_purchasely_fullscreen_v23_light_status_bar.xml

@@ -0,0 +1,7 @@
+<resources>
+    <style name="Theme.Purchasely.Fullscreen.Light" parent="Theme.AppCompat.Light.NoActionBar">
+      <item name="android:navigationBarColor">@android:color/transparent</item>
+      <item name="android:statusBarColor">@android:color/transparent</item>
+      <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>

package/src/ios/CDVPurchasely.h

@@ -11,16 +11,13 @@
 @interface CDVPurchasely<PLYEventDelegate> : CDVPlugin {
 }
 
-@property (nonatomic, retain) UIViewController* presentedPresentationViewController;
+@property (nonatomic, assign) UIViewController* presentedPresentationViewController;
 
 @property CDVInvokedUrlCommand* purchasedCommand;
 @property CDVInvokedUrlCommand* eventCommand;
 
-@property CDVInvokedUrlCommand* loginTappedCommand;
-@property void (^loginClosedHandler)(BOOL loggedIn);
-
-@property CDVInvokedUrlCommand* authorizePurchaseCommand;
-@property void (^authorizePurchaseHandler)(BOOL authorizePurchase);
+@property CDVInvokedUrlCommand* paywallActionInterceptorCommand;
+@property void (^onProcessActionHandler)(BOOL proceed);
 
 - (void)startWithAPIKey:(CDVInvokedUrlCommand*)command;
 - (void)setLogLevel:(CDVInvokedUrlCommand*)command;
@@ -36,6 +33,7 @@
 - (void)presentSubscriptions:(CDVInvokedUrlCommand*)command;
 - (void)purchaseWithPlanVendorId:(CDVInvokedUrlCommand*)command;
 - (void)restoreAllProducts:(CDVInvokedUrlCommand*)command;
+- (void)silentRestoreAllProducts:(CDVInvokedUrlCommand*)command;
 - (void)purchasedSubscription:(CDVInvokedUrlCommand*)command;
 - (void)allProducts:(CDVInvokedUrlCommand*)command;
 - (void)productWithIdentifier:(CDVInvokedUrlCommand*)command;
@@ -45,10 +43,8 @@
 - (void)removeEventsListener:(CDVInvokedUrlCommand*)command;
 - (void)handle:(CDVInvokedUrlCommand*)command;
 - (void)close:(CDVInvokedUrlCommand*)command;
-- (void)setLoginTappedHandler:(CDVInvokedUrlCommand*)command;
-- (void)onUserLoggedIn:(CDVInvokedUrlCommand*)command;
-- (void)setConfirmPurchaseHandler:(CDVInvokedUrlCommand*)command;
-- (void)processToPayment:(CDVInvokedUrlCommand*)command;
-
+- (void)setPaywallActionInterceptor:(CDVInvokedUrlCommand*)command;
+- (void)onProcessAction:(CDVInvokedUrlCommand*)command;
+- (void)closePaywall:(CDVInvokedUrlCommand*)command;
 
 @end