indigitall-capacitor-plugin 2.0.6 → 2.2.0

package/android/src/main/java/com/indigitall/capacitor/implementations/IndigitallCp.java

@@ -1,27 +1,69 @@
 package com.indigitall.capacitor.implementations;
 
+import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
-import com.indigitall.android.Configuration;
+import com.indigitall.android.commons.Constants;
+import com.indigitall.android.push.Configuration;
 import com.indigitall.android.Indigitall;
-import com.indigitall.android.callbacks.DeviceCallback;
-import com.indigitall.android.callbacks.EventCallback;
-import com.indigitall.android.callbacks.InitCallBack;
-import com.indigitall.android.callbacks.PushTokenCallback;
-import com.indigitall.android.callbacks.TopicsCallback;
-import com.indigitall.android.models.Push;
-import com.indigitall.android.utils.ServiceUtils;
+import com.indigitall.android.push.api.Client;
+import com.indigitall.android.push.api.requests.DeviceRequest;
+import com.indigitall.android.push.callbacks.DeviceCallback;
+import com.indigitall.android.push.callbacks.EventCallback;
+import com.indigitall.android.push.callbacks.InitCallBack;
+import com.indigitall.android.push.callbacks.PushTokenCallback;
+import com.indigitall.android.push.callbacks.TopicsCallback;
+import com.indigitall.android.push.models.DeviceStatus;
+import com.indigitall.android.push.models.Push;
+import com.indigitall.android.push.utils.PushPreferenceUtils;
+import com.indigitall.android.push.utils.ServiceUtils;
+import com.indigitall.capacitor.IndigitallCpPlugin;
 import com.indigitall.capacitor.utils.IndigitallParse;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+
 public class IndigitallCp {
 
-    public static void initialize(Context context, String className, JSONObject params, InitCallBack callback) {
+    public static void requestPushPermission(Context context) {
+        if (Build.VERSION.SDK_INT >= 33) {
+            String permission = "android.permission.POST_NOTIFICATIONS";
+            int code = Constants.REQUEST_PUSH_PERMISSION_CODE;
+            ArrayList<String> permissions = new ArrayList<>();
+            permissions.add(permission);
+            ActivityCompat.requestPermissions((Activity) context, permissions.toArray(new String[permissions.size()]), code);
+        }
+    }
+
+    public static void getPushPermissionStatus(Context context, PluginCall call) {
+        String permission = "android.permission.POST_NOTIFICATIONS";
+        try {
+            if (ContextCompat.checkSelfPermission(context, permission) != PackageManager.PERMISSION_GRANTED) {
+                JSObject ret = new JSObject();
+                ret.put("STATUS", "denied");
+                call.resolve(ret);
+            } else {
+                JSObject ret = new JSObject();
+                ret.put("STATUS", "granted");
+                call.resolve(ret);
+            }
+        } catch (Exception ex) {
+            call.reject(ex.getLocalizedMessage());
+        }
+    }
+    public static void initialize(Context context, Activity activity, JSONObject params, InitCallBack callback) {
         final String JSON_APP_KEY = "appKey";
         final String JSON_SENDER_ID = "senderId";
         final String JSON_REQUEST_LOCATION = "requestLocation";
@@ -29,17 +71,19 @@ public class IndigitallCp {
         final String JSON_PRODUCT_VERSION = "productVersion";
         final String JSON_WIFI_FILTER = "wifiFilterEnabled";
         final String JSON_URL_DEVICE_API = "urlDeviceApi";
-        final String JSON_URL_INAPP_API = "urlInAppApi";
         final String JSON_URL_INBOX_API = "urlInboxApi";
+        final String JSON_SET_ALWAYS_LAUNCH_ON_INIT = "alwaysLaunchOnInit";
+        final String JSON_SET_AUTO_REQUEST_PUSH_PERMISSION = "autoRequestPushPermission";
 
         String appKey = null,
                 senderId = null,
                 productName = null,
                 productVersion = null,
                 urlDeviceApi = "https://device-api.indigitall.com/v1",
-                urlInAppApi = "https://inapp-api.indigitall.com/v1",
                 urlInboxApi = "https://inbox-api.indigitall.com/v1";
         boolean requestLocation = false,
+                alwaysLaunchOnInit = false,
+                autoRequestPushPermission = true,
                 wifiFilterEnabled = false;
         try {
             if (params.length() > 0) {
@@ -50,50 +94,67 @@ public class IndigitallCp {
                 if (params.has(JSON_PRODUCT_VERSION)) productVersion = params.getString(JSON_PRODUCT_VERSION);
                 if (params.has(JSON_WIFI_FILTER)) wifiFilterEnabled = params.getBoolean(JSON_WIFI_FILTER);
                 if (params.has(JSON_URL_DEVICE_API)) urlDeviceApi = params.getString(JSON_URL_DEVICE_API);
-                if (params.has(JSON_URL_INAPP_API)) urlInAppApi = params.getString(JSON_URL_INAPP_API);
                 if (params.has(JSON_URL_INBOX_API)) urlInboxApi = params.getString(JSON_URL_INBOX_API);
+                if (params.has(JSON_SET_ALWAYS_LAUNCH_ON_INIT)) alwaysLaunchOnInit = params.getBoolean(JSON_SET_ALWAYS_LAUNCH_ON_INIT);
+                if (params.has(JSON_SET_AUTO_REQUEST_PUSH_PERMISSION)) autoRequestPushPermission = params.getBoolean(JSON_SET_AUTO_REQUEST_PUSH_PERMISSION);
             }
         } catch(JSONException ex) {
             ex.printStackTrace();
         }
 
+        ArrayList<String> permissions = new ArrayList<>();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (autoRequestPushPermission && Build.VERSION.SDK_INT >= 33) {
+                if (activity.checkSelfPermission("android.permission.POST_NOTIFICATIONS") !=
+                        PackageManager.PERMISSION_GRANTED  ){
+                    permissions.add("android.permission.POST_NOTIFICATIONS");
+                }
+            }
+            if (requestLocation && activity.checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) !=
+                    PackageManager.PERMISSION_GRANTED  ){
+                permissions.add(Manifest.permission.ACCESS_FINE_LOCATION);
+            }
+            if (permissions.size() > 0) ActivityCompat.requestPermissions((Activity) context, permissions.toArray(new String[permissions.size()]), Constants.REQUEST_PERMISSION_CODE);
+        }
 
         if (appKey != null && senderId != null) {
             Configuration config = new Configuration.Builder(appKey, senderId)
-                    .setDefaultActivity(className)
+                    .setDefaultActivity(activity.getClass().getName())
                     .setAutoRequestPermissionLocation(requestLocation)
                     .setProductName(productName)
                     .setProductVersion(productVersion)
                     .wifiFilterEnabled(wifiFilterEnabled)
                     .setUrlDeviceApi(urlDeviceApi)
                     .setUrlInboxApi(urlInboxApi)
+                    .setAlwaysLaunchOnInit(alwaysLaunchOnInit)
+                    .setAutoRequestPushPermission(autoRequestPushPermission)
                     .build();
-            Indigitall.init(context,config, callback);
+            Indigitall.INSTANCE.init(context,config, callback);
         }
     }
 
     public static void deviceGet(Context context, DeviceCallback callback) {
-        Indigitall.deviceGet(context, callback);
+        Indigitall.INSTANCE.deviceGet(context, callback);
     }
 
     public static void deviceEnable(Context context, DeviceCallback callback) {
-        Indigitall.deviceEnable(context, callback);
+        Indigitall.INSTANCE.deviceEnable(context, callback);
     }
 
     public static void deviceDisable(Context context, DeviceCallback callback) {
-        Indigitall.deviceDisable(context, callback);
+        Indigitall.INSTANCE.deviceDisable(context, callback);
     }
 
     public static void topicsList(Context context, TopicsCallback callback) {
-        Indigitall.topicsList(context, callback);
+        Indigitall.INSTANCE.topicsList(context, callback);
     }
 
     public static void topicsSubscribe(Context context, String[] topics, TopicsCallback callback) {
-        Indigitall.topicsSubscribe(context, topics, callback);
+        Indigitall.INSTANCE.topicsSubscribe(context, topics, callback);
     }
 
     public static void topicsUnsubscribe(Context context, String[] topics, TopicsCallback callback) {
-        Indigitall.topicsUnsubscribe(context, topics, callback);
+        Indigitall.INSTANCE.topicsUnsubscribe(context, topics, callback);
     }
 
     public static void sendCustomEvent(Context context, JSONObject json, EventCallback callback)  throws JSONException {
@@ -103,7 +164,7 @@ public class IndigitallCp {
         JSONObject eventCustomData = null;
         if (json.has(JSON_EVENT)) eventCustom = json.getString(JSON_EVENT);
         if (json.has(JSON_EVENT_DATA)) eventCustomData = new JSONObject(json.getString(JSON_EVENT_DATA));
-        Indigitall.sendCustomEvent(context, eventCustom, eventCustomData, callback);
+        Indigitall.INSTANCE.sendCustomEvent(context, eventCustom, eventCustomData, callback);
     }
 
     public static JSONObject getPush(Context context, Intent intent) throws JSONException {
@@ -144,10 +205,14 @@ public class IndigitallCp {
     }
 
     public static void logIn(Context context, String externalId, DeviceCallback callback) {
-        Indigitall.logIn(context, externalId, callback);
+        Indigitall.INSTANCE.logIn(context, externalId, callback);
     }
 
     public static void logOut(Context context, DeviceCallback callback) {
-        Indigitall.logOut(context, callback);
+        Indigitall.INSTANCE.logOut(context, callback);
+    }
+
+    public static void onRequestPermissionsResult(Context context, int requestCode, String[] permissions, int[] grantResults) {
+        Indigitall.INSTANCE.onRequestPermissionsResult(context, requestCode, permissions, grantResults);
     }
 }

package/android/src/main/java/com/indigitall/capacitor/models/CpIndigitallHiddenActivity.java

@@ -8,8 +8,8 @@ import android.util.Log;
 
 import androidx.annotation.Nullable;
 
-import com.indigitall.android.HiddenActivity;
-import com.indigitall.android.models.Push;
+import com.indigitall.android.push.HiddenActivity;
+import com.indigitall.android.push.models.Push;
 import com.indigitall.capacitor.IndigitallCpPlugin;
 import com.indigitall.capacitor.utils.CpPreferenceUtils;
 
@@ -48,4 +48,4 @@ public class CpIndigitallHiddenActivity extends HiddenActivity {
       }
 
     }
-}
+}

package/android/src/main/java/com/indigitall/capacitor/models/CpPushNotification.java

@@ -3,9 +3,12 @@ package com.indigitall.capacitor.models;
 import android.app.PendingIntent;
 import android.content.Context;
 
+import androidx.annotation.Nullable;
+
 import com.indigitall.android.commons.models.CorePushAction;
-import com.indigitall.android.models.Push;
-import com.indigitall.android.models.PushNotification;
+import com.indigitall.android.push.models.Push;
+import com.indigitall.android.push.models.PushAction;
+import com.indigitall.android.push.models.PushNotification;
 import com.indigitall.capacitor.utils.CpIndigitallUtils;
 
 public class CpPushNotification extends PushNotification {
@@ -22,9 +25,11 @@ public class CpPushNotification extends PushNotification {
         super.showNotification(context);
     }
 
-    @Override
-    public PendingIntent getIntent(CorePushAction action, int clickedButton) {
-        return CpIndigitallUtils.getIntent(context, push, action, clickedButton);
-    }
+  @Nullable
+  @Override
+  public PendingIntent getIntent(@Nullable PushAction pushAction, int clickedButton) {
+    return CpIndigitallUtils.getIntent(context, push, pushAction, clickedButton);
+  }
+
 
-}
+}

package/android/src/main/java/com/indigitall/capacitor/services/IndigitallFirebaseMessagingService.java

@@ -5,9 +5,9 @@ import android.util.Log;
 
 import com.getcapacitor.PluginCall;
 import com.google.firebase.messaging.RemoteMessage;
-import com.indigitall.android.models.Push;
-import com.indigitall.android.services.FirebaseMessagingService;
-import com.indigitall.android.utils.FirebaseUtils;
+import com.indigitall.android.push.models.Push;
+import com.indigitall.android.push.services.FirebaseMessagingService;
+import com.indigitall.android.push.utils.FirebaseUtils;
 import com.indigitall.capacitor.IndigitallCpPlugin;
 import com.indigitall.capacitor.implementations.IndigitallCp;
 import com.indigitall.capacitor.models.CpPushNotification;

package/android/src/main/java/com/indigitall/capacitor/utils/CpIndigitallUtils.java

@@ -8,10 +8,10 @@ import android.content.Intent;
 import com.indigitall.android.commons.models.CorePush;
 import com.indigitall.android.commons.models.CorePushAction;
 import com.indigitall.android.commons.utils.IntentUtils;
-import com.indigitall.android.models.Push;
-import com.indigitall.android.models.PushAction;
-import com.indigitall.android.services.StatisticService;
-import com.indigitall.android.utils.PushPreferenceUtils;
+import com.indigitall.android.push.models.Push;
+import com.indigitall.android.push.models.PushAction;
+import com.indigitall.android.push.services.StatisticService;
+import com.indigitall.android.push.utils.PushPreferenceUtils;
 import com.indigitall.capacitor.models.CpIndigitallHiddenActivity;
 
 public class CpIndigitallUtils {

package/android/src/main/java/com/indigitall/capacitor/utils/IndigitallInAppParse.java

@@ -19,37 +19,41 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 
 public class IndigitallInAppParse {
-   
-    public static JSONObject jsonFromInApp(InApp inApp) {
-        JSONObject json = new JSONObject();
-        final String JSON_INAPP_ID = "inAppId";
-        final String JSON_LAST_VERSION_ID = "lastVersionId";
-        final String JSON_SHOW_ONCE = "showOnce";
-        final String JSON_CACHE_TTL = "cacheTtl";
-        final String JSON_CREATION_DATE = "creationDate";
-        final String JSON_EXPIRED_DATE = "expiredDate";
-        final String JSON_PROPERTIES = "properties";
-        final String JSON_SCHEMA = "schema";
-        final String JSON_VERSION = "version";
-        final String JSON_CUSTOM_DATA = "customData";
-        final String JSON_INAPP_SHOW = "inAppShow";
 
-        try {
-            json.put(JSON_INAPP_ID, inApp.getInAppId());
-            json.put(JSON_LAST_VERSION_ID, inApp.getLastVersionId());
-            json.put(JSON_SHOW_ONCE, inApp.isShowOnce());
-            if (inApp.getCacheTtl() != null)  json.put(JSON_CACHE_TTL, inApp.getCacheTtl());
-            if (inApp.getCreationDate() != null) json.put(JSON_CREATION_DATE, inApp.getCreationDate());
-            if (inApp.getExpiredDate() != null) json.put(JSON_EXPIRED_DATE, inApp.getExpiredDate());
-            if (inApp.getProperties() != null) json.put(JSON_PROPERTIES, jsonFromProperties(inApp.getProperties()));
-            if (inApp.getSchema() != null) json.put(JSON_SCHEMA, jsonFromSchema(inApp.getSchema()));
-            json.put(JSON_VERSION, inApp.getVersion());
-            if (inApp.getCustomData() != null) json.put(JSON_CUSTOM_DATA, new JSONObject(inApp.getCustomData()));
-            if (inApp.getInAppShow() != null) json.put(JSON_INAPP_SHOW, jsonFromInAppShow(inApp.getInAppShow()));
-        } catch (JSONException ex) {
-            ex.printStackTrace();
-        }
-        return json;
+    public static JSONObject jsonFromInApp(InApp inApp) {
+      JSONObject json = new JSONObject();
+      final String JSON_INAPP_ID = "inAppId";
+      final String JSON_LAST_VERSION_ID = "lastVersionId";
+      final String JSON_SHOW_ONCE = "showOnce";
+      final String JSON_CACHE_TTL = "cacheTtl";
+      final String JSON_CREATION_DATE = "creationDate";
+      final String JSON_EXPIRED_DATE = "expiredDate";
+      final String JSON_PROPERTIES = "properties";
+      final String JSON_SCHEMA = "schema";
+      final String JSON_VERSION = "version";
+      final String JSON_CUSTOM_DATA = "customData";
+      final String JSON_INAPP_SHOW = "inAppShow";
+      final String JSON_INAPP_FILTERS = "filters";
+      final String JSON_INAPP_NAME = "name";
+
+      try {
+        json.put(JSON_INAPP_ID, inApp.getInAppId());
+        json.put(JSON_LAST_VERSION_ID, inApp.getLastVersionId());
+        json.put(JSON_SHOW_ONCE, inApp.isShowOnce());
+        if (inApp.getCacheTtl() != null)  json.put(JSON_CACHE_TTL, inApp.getCacheTtl());
+        if (inApp.getCreationDate() != null) json.put(JSON_CREATION_DATE, inApp.getCreationDate());
+        if (inApp.getExpiredDate() != null) json.put(JSON_EXPIRED_DATE, inApp.getExpiredDate());
+        if (inApp.getProperties() != null) json.put(JSON_PROPERTIES, jsonFromProperties(inApp.getProperties()));
+        if (inApp.getSchema() != null) json.put(JSON_SCHEMA, jsonFromSchema(inApp.getSchema()));
+        json.put(JSON_VERSION, inApp.getVersion());
+        if (inApp.getCustomData() != null) json.put(JSON_CUSTOM_DATA, new JSONObject(inApp.getCustomData()));
+        if (inApp.getInAppShow() != null) json.put(JSON_INAPP_SHOW, jsonFromInAppShow(inApp.getInAppShow()));
+        if (inApp.getName() != null) json.put(JSON_INAPP_NAME, inApp.getName());
+        if (inApp.getFilters() != null) json.put(JSON_INAPP_FILTERS, inApp.getFilters().toJSON());
+      } catch (JSONException ex) {
+        ex.printStackTrace();
+      }
+      return json;
     }
     public static JSONObject jsonFromSchema(InAppSchema schema) {
         JSONObject json = new JSONObject();
@@ -117,6 +121,7 @@ public class IndigitallInAppParse {
         final String JSON_TYPE_CALL = "call";
         final String JSON_TYPE_MARKET = "market";
         final String JSON_TYPE_SHARE = "share";
+      final String JSON_TYPE_WEBVIEW = "webview";
 
         JSONObject json = new JSONObject();
         try {
@@ -128,6 +133,7 @@ public class IndigitallInAppParse {
             if (action.getCall() != null) json.put(JSON_TYPE_CALL, action.getCall() );
             if (action.getMarket() != null) json.put(JSON_TYPE_MARKET, action.getMarket() );
             if (action.getShare() != null) json.put(JSON_TYPE_SHARE, action.getShare() );
+          if (action.getWebview() != null) json.put(JSON_TYPE_WEBVIEW, action.getWebview() );
 
         } catch (JSONException ex) {
             ex.printStackTrace();
@@ -159,6 +165,17 @@ public class IndigitallInAppParse {
         return json;
     }
 
+  public static JSONObject jsonFromErrorModel(InAppErrorModel error) {
+    JSONObject json = new JSONObject();
+    try {
+      json.put("errorCode", error.getErrorCode());
+      json.put("errorMessage", error.getErrorMessage());
+    } catch (JSONException e) {
+      e.printStackTrace();
+    }
+    return json;
+  }
+
     public static String[] parseArrayList(JSONArray array) {
         String[] topicsList = new String[array.length()];
         try {
@@ -171,8 +188,8 @@ public class IndigitallInAppParse {
         return topicsList;
     }
 
-    
-    
+
+
 
 
 }

package/android/src/main/java/com/indigitall/capacitor/utils/IndigitallParse.java

@@ -17,11 +17,12 @@ import com.indigitall.android.inbox.models.InboxCounters;
 import com.indigitall.android.inbox.models.InboxNotification;
 import com.indigitall.android.inbox.models.InboxPush;
 import com.indigitall.android.inbox.models.InboxPushButton;
-import com.indigitall.android.models.Device;
-import com.indigitall.android.models.ExternalApp;
-import com.indigitall.android.models.Push;
-import com.indigitall.android.models.PushButton;
-import com.indigitall.android.models.Topic;
+import com.indigitall.android.push.models.Device;
+import com.indigitall.android.push.models.ExternalApp;
+import com.indigitall.android.push.models.Push;
+import com.indigitall.android.push.models.PushButton;
+import com.indigitall.android.push.models.Topic;
+import com.indigitall.android.commons.models.CorePushButton;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -95,7 +96,13 @@ public class IndigitallParse {
             json.put(JSON_BODY, message.getBody());
             json.put(JSON_IMAGE, message.getImage());
             if (message.getAction() != null) json.put(JSON_ACTION, jsonFromAction(message.getAction()));
-            json.put(JSON_BUTTONS, jsonFromPushButtons(message.getButtons()));
+            if (message.getButtons() != null) {
+              ArrayList<PushButton> buttons = new ArrayList<PushButton>();
+              for (int i = 0; i < message.getButtons().size(); i++) {
+                buttons.add(new PushButton(message.getButtons().get(i).toString()));
+              }
+              json.put(JSON_BUTTONS, jsonFromPushButtons(buttons));
+            }
             json.put(JSON_DATA, message.getData());
             json.put(JSON_SECURED_DATA, message.getSecuredData());
 
@@ -155,14 +162,14 @@ public class IndigitallParse {
         return json;
     }
 
-    private static JSONArray jsonFromPushButtons(ArrayList<InboxPushButton> buttons) {
+    private static JSONArray jsonFromPushButtons(ArrayList<PushButton> buttons) {
         final String JSON_LABEL = "label";
         final String JSON_ACTION = "action";
 
         JSONArray array = new JSONArray();
         if (buttons != null) {
             try {
-                for (CorePushButton button : buttons) {
+                for (PushButton button : buttons) {
                     JSONObject json = new JSONObject();
                     json.put(JSON_LABEL, button.getLabel());
                     if (button.getAction() != null) json.put(JSON_ACTION,jsonFromAction(button.getAction()));
@@ -449,80 +456,6 @@ public class IndigitallParse {
         return json;
     }
 
-    public static JSONObject jsonFromInApp(InApp inApp) {
-        final String INAPPID = "inAppId";
-        final String LAST_VERSION_ID = "lastVersionId";
-        final String SHOW_ONCE = "showOnce";
-        final String RENEWAL_TIME = "renewalTime";
-        final String CREATION_DATE = "creationDate";
-        final String EXPIRED_DATE = "expiredDate";
-        final String PROPERTIES = "properties";
-        final String SCHEMA = "schema";
-
-        JSONObject json = new JSONObject();
-        try {
-            json.put(INAPPID, inApp.getInAppId());
-            json.put(LAST_VERSION_ID, inApp.getLastVersionId());
-            json.put(SHOW_ONCE, inApp.isShowOnce());
-            json.put(CREATION_DATE, inApp.getCreationDate());
-            json.put(EXPIRED_DATE, inApp.getExpiredDate());
-            json.put(PROPERTIES, jsonFromInAppProperties(inApp.getProperties()));
-            json.put(SCHEMA, jsonFromInAppSchema(inApp.getSchema()));
-        } catch (JSONException ex) {
-            ex.printStackTrace();
-        }
-        return json;
-    }
-
-    public static JSONObject jsonFromInAppProperties(InAppProperties properties) {
-        final String ACTION = "action";
-        final String CONTENT_URL = "contentUrl";
-        final String SHOWTIME  = "showTime";
-        final String LAYOUT  = "layout";
-        final String NUMBER_OF_SHOWS = "numberOfShows";
-        final String NUMBER_OF_CLIKS = "numberOfClicks";
-        final String DISMISS_FOREVER = "dismissForever";
-
-        JSONObject json = new JSONObject();
-        try {
-            json.put(ACTION, jsonFromAction(properties.getAction()));
-            json.put(CONTENT_URL, properties.getContentUrl());
-            json.put(SHOWTIME, properties.getShowTime());
-            json.put(LAYOUT, jsonFromInAppLayout(properties.getLayout()));
-            json.put(NUMBER_OF_SHOWS, properties.getNumberOfShows());
-            json.put(NUMBER_OF_CLIKS, properties.getNumberOfClicks());
-            json.put(DISMISS_FOREVER, properties.getDismissForever());
-        } catch (JSONException ex) {
-            ex.printStackTrace();
-        }
-        return json;
-    }
-
-    public static JSONObject jsonFromInAppLayout(InAppLayout layout) {
-        final String BORDER_RADIUS = "borderRadius";
-        JSONObject json = new JSONObject();
-        try {
-            json.put(BORDER_RADIUS, layout.getBorderRadius());
-        } catch (JSONException ex) {
-            ex.printStackTrace();
-        }
-        return json;
-    }
-
-    public static JSONObject jsonFromInAppSchema(InAppSchema schema) {
-        final String CODE = "code";
-        final String WIDTH = "width";
-        final String HEIGHT = "height";
-        JSONObject json = new JSONObject();
-        try {
-            json.put(CODE, schema.getCode());
-            json.put(WIDTH, schema.getWidth());
-            json.put(HEIGHT, schema.getHeight());
-        } catch (JSONException ex) {
-            ex.printStackTrace();
-        }
-        return json;
-    }
 
 
 }

package/dist/docs.json

@@ -5,6 +5,26 @@
     "docs": "",
     "tags": [],
     "methods": [
+      {
+        "name": "requestPushPermission",
+        "signature": "() => Promise<any>",
+        "parameters": [],
+        "returns": "Promise<any>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "requestpushpermission"
+      },
+      {
+        "name": "getPushPermissionStatus",
+        "signature": "() => Promise<any>",
+        "parameters": [],
+        "returns": "Promise<any>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "getpushpermissionstatus"
+      },
       {
         "name": "initialize",
         "signature": "(params: { config: any; }) => Promise<any>",
@@ -229,12 +249,12 @@
       },
       {
         "name": "logIn",
-        "signature": "(param: { externalId: string; }) => Promise<any>",
+        "signature": "(param: { externalCode: string; }) => Promise<any>",
         "parameters": [
           {
             "name": "param",
             "docs": "",
-            "type": "{ externalId: string; }"
+            "type": "{ externalCode: string; }"
           }
         ],
         "returns": "Promise<any>",