@purchasely/cordova-plugin-purchasely 1.2.0 → 2.1.1

package/example/www/js/index.js

@@ -27,16 +27,14 @@ function onDeviceReady() {
 	console.log('Running cordova-' + cordova.platformId + '@' + cordova.version);
 	document.getElementById('deviceready').classList.add('ready');
 
-	console.log("Hi");
-
 	Purchasely.setLanguage('en')
-	
+
 	Purchasely.startWithAPIKey(
 		'afa96c76-1d8e-4e3c-a48f-204a3cd93a15',
 		['Google'],
 		null,
 		Purchasely.LogLevel.DEBUG,
-		false,
+		Purchasely.RunningMode.full,
 		(isConfigured) => {
 			if(isConfigured) onPuchaselySdkReady();
 		},
@@ -88,6 +86,22 @@ function onPuchaselySdkReady() {
 
 	Purchasely.isReadyToPurchase(true);
 
+	Purchasely.planWithIdentifier('PURCHASELY_PLUS_MONTHLY', (plan) => {
+		console.log(' ==> Plan');
+		console.log(plan.vendorId);
+		console.log(plan.productId);
+		console.log(plan.name);
+		console.log(plan.price);
+		console.log(plan.amount);
+		console.log(plan.period);
+		console.log(plan.hasIntroductoryPrice);
+		console.log(plan.introPrice);
+		console.log(plan.introAmount);
+		console.log(plan.introDuration);
+	}, (error) => {
+		console.log(error);
+	});
+
 	Purchasely.setDefaultPresentationResultHandler(callback => {
 		console.log(callback);
 		if(callback.result == Purchasely.PurchaseResult.CANCELLED) {
@@ -96,26 +110,56 @@ function onPuchaselySdkReady() {
 			console.log("User purchased " + callback.plan.vendorId);
 		}
 	},
-												   (error) => {
+		(error) => {
 		console.log("Error with purchase : " + error);
 	});
 
-	Purchasely.setLoginTappedHandler(onLoginTapped => {
-		// Present your own screen for user to log in
-
-		// Call this method to update Purchasely Paywall
-		Purchasely.userLogin('my_user_id');
-		Purchasely.onUserLoggedIn(true);
-	});
-
-	Purchasely.setConfirmPurchaseHandler(onPurchaseTapped => {
-		// Present your own screen before purchase
+	Purchasely.setPaywallActionInterceptor((result) => {
+		console.log(result);
+		console.log('Received action from paywall ' + result.info.presentationId);
+
+		if (result.action === Purchasely.PaywallAction.navigate) {
+			console.log(
+			'User wants to navigate to website ' +
+				result.parameters.title +
+				' ' +
+				result.parameters.url
+			);
+			console.log('prevent Purchasely SDK to navigate to website');
+			Purchasely.onProcessAction(false);
+		} else if (result.action === Purchasely.PaywallAction.close) {
+			console.log('User wants to close paywall');
+			Purchasely.onProcessAction(true);
+		} else if (result.action === Purchasely.PaywallAction.login) {
+			console.log('User wants to login');
+			//Present your own screen for user to log in
+			Purchasely.closePaywall();
+			Purchasely.userLogin('MY_USER_ID');
+			//Call this method to update Purchasely Paywall
+			Purchasely.onProcessAction(true);
+		} else if (result.action === Purchasely.PaywallAction.open_presentation) {
+			console.log('User wants to open a new paywall');
+			Purchasely.onProcessAction(true);
+		} else if (result.action === Purchasely.PaywallAction.purchase) {
+			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);
+		} else {
+			console.log('Action unknown ' + result.action);
+			Purchasely.onProcessAction(true);
+		}
 	});
 }
 
 function openPresentation() {
 	Purchasely.presentPresentationWithIdentifier(
 		null,
+		null,
+		true,
 		(callback) => {
 			console.log(callback);
 			if(callback.result == Purchasely.PurchaseResult.CANCELLED) {
@@ -140,7 +184,7 @@ function purchaseWithPlanVendorId() {
 
 function processToPayment() {
 	// Call this method to process to payment
-	Purchasely.processToPayment(true);
+	Purchasely.onProcessAction(true);
 }
 
 function restore() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purchasely/cordova-plugin-purchasely",
-  "version": "1.2.0",
+  "version": "2.1.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.2.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="2.1.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.8.0"/>
+                <pod name="Purchasely" spec="3.1.0"/>
             </pods>
         </podspec>
     </platform>
@@ -51,10 +51,13 @@
                 android:theme="@style/Theme.AppCompat.Light.NoActionBar">
             </activity>
         </config-file>
-        <framework src="io.purchasely:core:2.8.0" />
+        <framework src="io.purchasely:core:3.1.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" />
         <source-file src="src/android/activity_ply_product_activity.xml" target-dir="res/layout"/>
+        <source-file src="src/android/theme_purchasely_fullscreen.xml" target-dir="res/values"/>
+        <source-file src="src/android/theme_purchasely_fullscreen_v23_light_status_bar.xml" target-dir="res/values-v23"/>
+        <source-file src="src/android/theme_purchasely_fullscreen_v23.xml" target-dir="res/values-v23"/>
     </platform>
 </plugin>

package/src/android/.idea/workspace.xml

@@ -4,12 +4,17 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ad0a27bd-64f4-4852-98a1-a7dc8e28a72f" name="Default Changelist" comment="" />
+    <list default="true" id="ad0a27bd-64f4-4852-98a1-a7dc8e28a72f" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/../../plugin.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../plugin.xml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
+  </component>
   <component name="ProjectId" id="1uz33TZxRidCdjXlE00OtDvw6mD" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -18,7 +23,9 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="android.sdk.path" value="$USER_HOME$/Android/Sdk" />
+    <property name="dart.analysis.tool.window.visible" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
@@ -31,4 +38,15 @@
     </task>
     <servers />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
 </project>

package/src/android/PLYProductActivity.java

@@ -6,6 +6,7 @@ import android.os.Bundle;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.WindowCompat;
 import androidx.fragment.app.Fragment;
 
 import java.lang.ref.WeakReference;
@@ -18,6 +19,12 @@ public class PLYProductActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        boolean isFullScreen = getIntent().getExtras().getBoolean("isFullScreen");
+        if(isFullScreen) {
+            WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+        }
+
         String package_name = getApplication().getPackageName();
         setContentView(getApplication().getResources()
                 .getIdentifier("activity_ply_product_activity",
@@ -26,17 +33,25 @@ public class PLYProductActivity extends AppCompatActivity {
         );
 
         String presentationId = getIntent().getExtras().getString("presentationId");
+        String placementId = getIntent().getExtras().getString("placementId");
         String productId = getIntent().getExtras().getString("productId");
         String planId = getIntent().getExtras().getString("planId");
         String contentId = getIntent().getExtras().getString("contentId");
 
         Fragment fragment;
-        if(planId != null && !planId.isEmpty()) {
-            fragment = Purchasely.planFragment(planId, presentationId, contentId, listener);
+        if(placementId != null && !placementId.isEmpty()) {
+            fragment = Purchasely.presentationFragmentForPlacement(placementId, contentId, null, listener);
+        } else if(planId != null && !planId.isEmpty()) {
+            fragment = Purchasely.planFragment(planId, presentationId, contentId, null, listener);
         } else if(productId != null && !productId.isEmpty()) {
-            fragment = Purchasely.productFragment(productId, presentationId, contentId, listener);
+            fragment = Purchasely.productFragment(productId, presentationId, contentId, null, listener);
         } else {
-            fragment = Purchasely.presentationFragment(presentationId, contentId, listener);
+            fragment = Purchasely.presentationFragment(presentationId, contentId, null, listener);
+        }
+
+        if(fragment == null) {
+            supportFinishAfterTransition();
+            return;
         }
 
         getSupportFragmentManager().beginTransaction()

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;
@@ -19,18 +22,22 @@ 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;
@@ -52,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) {
@@ -61,11 +73,11 @@ 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),
+                            args.getInt(4),
                             callbackContext);
                     break;
                 case "close":
@@ -81,19 +93,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(args.getString(0));
+                    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);
@@ -109,24 +121,35 @@ public class PurchaselyPlugin extends CordovaPlugin {
                     break;
                 case "presentPresentationWithIdentifier":
                     presentPresentationWithIdentifier(
-                        args.getString(0),
-                        args.getString(1),
+                        getStringFromJson(args.getString(0)),
+                        getStringFromJson(args.getString(1)),
+                        args.getBoolean(2),
                         callbackContext
                         );
                     break;
+                case "presentPresentationForPlacement":
+                    presentPresentationForPlacement(
+                            getStringFromJson(args.getString(0)),
+                            getStringFromJson(args.getString(1)),
+                            args.getBoolean(2),
+                            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)),
+                        args.getBoolean(3),
                         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)),
+                        args.getBoolean(3),
                         callbackContext
                     );
                     break;
@@ -143,35 +166,32 @@ public class PurchaselyPlugin extends CordovaPlugin {
                     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;
-                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;
@@ -183,6 +203,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) {
@@ -211,7 +239,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++) {
@@ -223,11 +251,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();
 
@@ -275,8 +309,7 @@ public class PurchaselyPlugin extends CordovaPlugin {
     private void close() {
         defaultCallback = null;
         presentationCallback = null;
-        loginClosedListener = null;
-        continuePurchaseListener = null;
+        processActionListener = null;
         productActivity = null;
         Purchasely.close();
     }
@@ -362,36 +395,54 @@ 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 presentPresentationForPlacement(String placementVendorId,
+                                                   String contentId,
+                                                   boolean isFullScreen,
+                                                   CallbackContext callbackContext) {
+        presentationCallback = callbackContext;
+        Intent intent = PLYProductActivity.newIntent(cordova.getActivity());
+        intent.putExtra("placementId", placementVendorId);
+        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);
     }
 
@@ -469,7 +520,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) {
@@ -487,7 +538,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) {
@@ -505,7 +556,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) {
@@ -528,53 +579,63 @@ 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);
+            String url = null;
+            if(map.getUrl() != null) {
+                url = map.getUrl().toString();
+            }
+
+            HashMap<String, Object> parametersForCordova = new HashMap<>();
+            parametersForCordova.put("title", map.getTitle());
+            parametersForCordova.put("url", url);
+            parametersForCordova.put("plan", transformPlanToMap(map.getPlan()));
+            parametersForCordova.put("presentation", map.getPresentation());
+
+            HashMap<String, Object> infoMap = new HashMap<>();
+            if(info.getContentId() != null) infoMap.put("contentId", info.getContentId());
+            if(info.getPresentationId() != null) infoMap.put("presentationId", info.getPresentationId());
+            if(info.getPlacementId() != null) infoMap.put("placementId", info.getPlacementId());
+
+            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,
+                    new JSONObject(resultForCordova)
+            );
             result.setKeepCallback(true);
             callbackContext.sendPluginResult(result);
         });
     }
 
-    private void onUserLoggedIn(boolean userLoggedIn) {
-        if(loginClosedListener != null)  {
-            if(productActivity != null) productActivity.relaunch(cordova);
-            cordova.getActivity().runOnUiThread(() -> loginClosedListener.userLoggedIn(userLoggedIn));
-        }
-    }
-
-    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);
-
-            PluginResult result = new PluginResult(PluginResult.Status.OK);
-            result.setKeepCallback(true);
-            callbackContext.sendPluginResult(result);
-        });
+    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 processToPayment(boolean continueToPayment) {
-        if(continuePurchaseListener != null) {
+    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();
                 }