cordova-plugin-insider 3.0.2 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-insider",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "description": "A plugin that you can use Insider SDK with Cordova and Ionic",
   "cordova_name": "Insider Cordova Plugin",
   "cordova": {

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-insider" version="3.0.2" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="cordova-plugin-insider" version="3.1.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Insider</name>
     <description>Insider Cordova Plugin</description>
     <keywords>insider,cordova,cordova-ios,cordova-android</keywords>
@@ -10,6 +10,7 @@
     </js-module>
 
     <js-module name="CallbackType" src="www/CallbackType.js"/>
+    <js-module name="CloseButtonPosition" src="www/CloseButtonPosition.js"/>
     <js-module name="ContentOptimizerDataType" src="www/ContentOptimizerDataType.js" />
     <js-module name="Gender" src="www/Gender.js" />
     <js-module name="Identifier" src="www/Identifier.js"/>
@@ -70,7 +71,7 @@
                 <source url="https://cdn.cocoapods.org/" />
             </config>
             <pods use-frameworks="true">
-                <pod name="InsiderMobile" spec="14.2.2" />
+                <pod name="InsiderMobile" spec="14.2.3" />
                 <pod name="InsiderGeofence" spec="1.2.4" />
                 <pod name="InsiderHybrid" spec="1.7.6" />
             </pods>
@@ -85,6 +86,9 @@
         <source-file src="src/ios/InsiderPlugin.m" />
         <header-file src="src/ios/InsiderPlugin.h" />
 
+        <source-file src="src/ios/CDVUtils.m" />
+        <header-file src="src/ios/CDVUtils.h" />
+
         <source-file src="src/ios/IDFAHelper.m" />
         <header-file src="src/ios/IDFAHelper.h" />
     </platform>

package/src/android/CDVUtils.java

@@ -1,22 +1,18 @@
 package com.useinsider.cordova;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.useinsider.insider.Insider;
 import com.useinsider.insider.InsiderProduct;
+import com.useinsider.insider.InsiderEvent;
+import com.useinsider.insiderhybrid.InsiderHybridUtils;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.lang.reflect.Array;
-import java.lang.reflect.Type;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 public class CDVUtils {
@@ -58,63 +54,302 @@ public class CDVUtils {
         return listdata;
     }
 
-    public static Map convertJSONObjectToMap(JSONObject jsonObject) throws JSONException {
-        HashMap map = new HashMap();
-
+    public static InsiderEvent parseEvent(String eventName, JSONArray parameters) {
         try {
-            Iterator<String> iterator = jsonObject.keys();
-            while (iterator.hasNext()) {
-                String key = iterator.next();
-                Object value = jsonObject.get(key);
-                if (value instanceof JSONObject) {
-                    map.put(key, convertJSONObjectToMap((JSONObject) value));
-                } else if (value instanceof JSONArray) {
-                    map.put(key, convertJSONArrayToArray((JSONArray) value));
-                } else if (value instanceof Boolean) {
-                    map.put(key, (Boolean) value);
-                } else if (value instanceof Integer) {
-                    map.put(key, (Integer) value);
-                } else if (value instanceof Double) {
-                    map.put(key, (Double) value);
-                } else if (value instanceof String) {
-                    map.put(key, (String) value);
-                } else {
-                    map.put(key, value.toString());
+            InsiderEvent event = Insider.Instance.tagEvent(eventName);
+        
+            if (parameters != null) {
+                for (int i = 0; i < parameters.length(); i++) {
+                    JSONObject parameter = parameters.getJSONObject(i);
+                    if (parameter == null) continue;
+                    
+                    String type = parameter.getString("type");
+                    String key = parameter.getString("key");
+                    if (type == null || key == null) continue;
+                    
+                    switch (type) {
+                        case "string":
+                            event.addParameterWithString(key, parameter.getString("value"));
+                            break;
+                        case "integer":
+                            event.addParameterWithInt(key, parameter.getInt("value"));
+                            break;
+                        case "double":
+                            event.addParameterWithDouble(key, parameter.getDouble("value"));
+                            break;
+                        case "boolean":
+                            event.addParameterWithBoolean(key, parameter.getBoolean("value"));
+                            break;
+                        case "date":
+                            // value is epoch milliseconds as string
+                            long epochValue = Long.parseLong(parameter.getString("value"));
+                            Date dateValue = new Date(epochValue);
+                            event.addParameterWithDate(key, dateValue);
+                            break;
+                        case "strings":
+                            JSONArray stringsArray = parameter.getJSONArray("value");
+                            String[] stringsValue = convertJSONArrayToStringArray(stringsArray);
+                            event.addParameterWithStringArray(key, stringsValue);
+                            break;
+                        case "numbers":
+                            JSONArray numbersArray = parameter.getJSONArray("value");
+                            Number[] numbersValue = convertJSONArrayToNumericArray(numbersArray);
+                            event.addParameterWithNumericArray(key, numbersValue);
+                            break;
+                    }
                 }
             }
+            
+            return event;
         } catch (Exception e) {
             Insider.Instance.putException(e);
         }
 
-        return map;
+        return null;
     }
 
-    public static ArrayList convertJSONArrayToArray(JSONArray jsonArray) throws JSONException {
-        ArrayList array = new ArrayList();
+    private static String[] convertJSONArrayToStringArray(JSONArray jsonArray){
+        try {
+            String[] result = new String[jsonArray.length()];
+
+            for (int i = 0; i < jsonArray.length(); i++) {
+                result[i] = jsonArray.getString(i);
+            }
+
+            return result;
+        } catch (Exception e) {
+            Insider.Instance.putException(e);
+        }
+
+        return null;
+    }
 
+    private static Number[] convertJSONArrayToNumericArray(JSONArray jsonArray) {
         try {
+            Number[] result = new Number[jsonArray.length()];
+
             for (int i = 0; i < jsonArray.length(); i++) {
                 Object value = jsonArray.get(i);
-                if (value instanceof JSONObject) {
-                    array.add(convertJSONObjectToMap((JSONObject) value));
-                } else if (value instanceof JSONArray) {
-                    array.add(convertJSONArrayToArray((JSONArray) value));
-                } else if (value instanceof Boolean) {
-                    array.add((Boolean) value);
-                } else if (value instanceof Integer) {
-                    array.add((Integer) value);
-                } else if (value instanceof Double) {
-                    array.add((Double) value);
+                if (value instanceof Number) {
+                    result[i] = (Number) value;
                 } else if (value instanceof String) {
-                    array.add((String) value);
-                } else {
-                    array.add(value.toString());
+                    try {
+                        result[i] = Double.parseDouble((String) value);
+                    } catch (NumberFormatException e) {
+                        result[i] = 0;
+                    }
                 }
             }
+
+            return result;
         } catch (Exception e) {
             Insider.Instance.putException(e);
         }
 
-        return array;
+        return null;
+    }
+
+    public static InsiderProduct parseProduct(Map<String, Object> requiredFields, Map<String, Object> optionalFields, JSONArray customParameters) {
+        try {
+            if (!isProductValid(requiredFields)) return null;
+
+            String[] taxonomy;
+            Object taxObject = requiredFields.get(Constants.TAXONOMY);
+
+            if (taxObject.getClass().isArray()) {
+                taxonomy = (String[]) taxObject;
+            } else {
+                taxonomy = ((ArrayList<String>) taxObject).toArray(new String[0]);
+            }
+
+            double price = 0;
+            if (requiredFields.get(Constants.UNIT_PRICE) instanceof Integer) {
+                price = Integer.valueOf((Integer) requiredFields.get(Constants.UNIT_PRICE)).doubleValue();
+            } else {
+                price = (double) requiredFields.get(Constants.UNIT_PRICE);
+            }
+
+            InsiderProduct product = Insider.Instance.createNewProduct(
+                    (String) requiredFields.get(Constants.PRODUCT_ID),
+                    (String) requiredFields.get(Constants.NAME),
+                    taxonomy,
+                    (String) requiredFields.get(Constants.IMAGE_URL),
+                    price,
+                    (String) requiredFields.get(Constants.CURRENCY)
+            );
+
+            // Apply optional fields
+            if (optionalFields != null && optionalFields.size() > 0) {
+                Map<String, Object> validatedMap = InsiderHybridUtils.validateMap(optionalFields);
+
+                for (Map.Entry<String, Object> entry : validatedMap.entrySet()) {
+                    Object value = entry.getValue();
+                    switch (entry.getKey()) {
+                        case Constants.SALE_PRICE:
+                            product.setSalePrice((double) value);
+                            break;
+                        case Constants.STOCK:
+                            product.setStock(((int) value));
+                            break;
+                        case Constants.COLOR:
+                            product.setColor((String) value);
+                            break;
+                        case Constants.SIZE:
+                            product.setSize((String) value);
+                            break;
+                        case Constants.QUANTITY:
+                            product.setQuantity(((int) value));
+                            break;
+                        case Constants.SHIPPING_COST:
+                            product.setShippingCost((double) value);
+                            break;
+                        case Constants.VOUCHER_NAME:
+                            product.setVoucherName((String) value);
+                            break;
+                        case Constants.VOUCHER_DISCOUNT:
+                            product.setVoucherDiscount((double) value);
+                            break;
+                        case Constants.PROMOTION_NAME:
+                            product.setPromotionName((String) value);
+                            break;
+                        case Constants.PROMOTION_DISCOUNT:
+                            product.setPromotionDiscount((double) value);
+                            break;
+                        case Constants.GROUP_CODE:
+                            product.setGroupCode((String) value);
+                            break;
+                        case Constants.BRAND:
+                            product.setBrand((String) value);
+                            break;
+                        case Constants.SKU:
+                            product.setSku((String) value);
+                            break;
+                        case Constants.PRODUCT_GENDER:
+                            product.setGender((String) value);
+                            break;
+                        case Constants.MULTIPACK:
+                            product.setMultipack((String) value);
+                            break;
+                        case Constants.PRODUCT_TYPE:
+                            product.setProductType((String) value);
+                            break;
+                        case Constants.GTIN:
+                            product.setGtin((String) value);
+                            break;
+                        case Constants.DESCRIPTION:
+                            product.setDescription((String) value);
+                            break;
+                        case Constants.TAGS:
+                            String[] tags;
+                            if (value.getClass().isArray()) {
+                                tags = (String[]) value;
+                            } else {
+                                tags = ((ArrayList<String>) value).toArray(new String[0]);
+                            }
+                            product.setTags(tags);
+                            break;
+                        case Constants.IS_IN_STOCK:
+                            product.setInStock((boolean) value);
+                            break;
+                        case Constants.PRODUCT_URL:
+                            product.setProductURL((String) value);
+                            break;
+                        default:
+                            setProductCustomAttribute(product, entry.getKey(), value);
+                            break;
+                    }
+                }
+            }
+
+            // Apply custom parameters
+            if (customParameters != null && customParameters.length() > 0) {
+                for (int i = 0; i < customParameters.length(); i++) {
+                    JSONObject param = customParameters.getJSONObject(i);
+                    if (param == null) continue;
+
+                    String type = param.getString("type");
+                    String key = param.getString("key");
+                    if (type == null || key == null) continue;
+
+                    switch (type) {
+                        case "string":
+                            product.setCustomAttributeWithString(key, param.getString("value"));
+                            break;
+                        case "integer":
+                            product.setCustomAttributeWithInt(key, param.getInt("value"));
+                            break;
+                        case "double":
+                            product.setCustomAttributeWithDouble(key, param.getDouble("value"));
+                            break;
+                        case "boolean":
+                            product.setCustomAttributeWithBoolean(key, param.getBoolean("value"));
+                            break;
+                        case "date":
+                            // value is epoch milliseconds as string
+                            long epochValue = Long.parseLong(param.getString("value"));
+                            Date dateValue = new Date(epochValue);
+                            product.setCustomAttributeWithDate(key, dateValue);
+                            break;
+                        case "strings":
+                            JSONArray stringsArray = param.getJSONArray("value");
+                            String[] stringsValue = convertJSONArrayToStringArray(stringsArray);
+                            product.setCustomAttributeWithStringArray(key, stringsValue);
+                            break;
+                        case "numbers":
+                            JSONArray numbersArray = param.getJSONArray("value");
+                            Number[] numbersValue = convertJSONArrayToNumericArray(numbersArray);
+                            product.setCustomAttributeWithNumericArray(key, numbersValue);
+                            break;
+                    }
+                }
+            }
+
+            return product;
+        } catch (Exception e) {
+            Insider.Instance.putException(e);
+        }
+        return null;
+    }
+
+    private static boolean isProductValid(Map<String, Object> requiredFields) {
+        return requiredFields.containsKey(Constants.PRODUCT_ID)
+                && requiredFields.containsKey(Constants.NAME)
+                && requiredFields.containsKey(Constants.TAXONOMY)
+                && requiredFields.containsKey(Constants.IMAGE_URL)
+                && requiredFields.containsKey(Constants.UNIT_PRICE)
+                && requiredFields.containsKey(Constants.CURRENCY);
+    }
+
+    private static void setProductCustomAttribute(InsiderProduct product, String key, Object value) {
+        try {
+            if (key == null || key.length() == 0 || value == null) return;
+            switch (value.getClass().getSimpleName()) {
+                case "String":
+                    product.setCustomAttributeWithString(key, (String) value);
+                    break;
+                case "Double":
+                    product.setCustomAttributeWithDouble(key, (double) value);
+                    break;
+                case "Integer":
+                    product.setCustomAttributeWithInt(key, (int) value);
+                    break;
+                case "Boolean":
+                    product.setCustomAttributeWithBoolean(key, (boolean) value);
+                    break;
+                case "Date":
+                    product.setCustomAttributeWithDate(key, (Date) value);
+                    break;
+                case "String[]":
+                    product.setCustomAttributeWithStringArray(key, (String[]) value);
+                    break;
+                case "Number[]":
+                    product.setCustomAttributeWithNumericArray(key, (Number[]) value);
+                    break;
+                default:
+                    break;
+            }
+        } catch (Exception e) {
+            Insider.Instance.putException(e);
+        }
     }
 }

package/src/android/Constants.java

@@ -6,6 +6,7 @@ class Constants {
     }
     
     static final String HANDLE_NOTIFICATION = "handleNotification";
+    static final String SET_INTERNAL_BROWSER_CLOSE_BUTTON_POSITION = "setInternalBrowserCloseButtonPosition";
     static final String ERROR = "error";
     static final String DEFAULT_VALUE = "defaultValue";
     static final String VARIABLE_NAME = "variableName";
@@ -48,4 +49,5 @@ class Constants {
     static final String DESCRIPTION = "desc";
     static final String TAGS = "tags";
     static final String IS_IN_STOCK = "iis";
+    static final String PRODUCT_URL = "product_url";
 }