indigitall-capacitor-plugin 2.0.5 → 2.1.0

package/IndigitallCapacitorPlugin.podspec

@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '12.0'
   s.dependency 'Capacitor'
-  s.dependency 'indigitall-ios', '~> 5.1.0'
+  s.dependency 'indigitall-ios', '~> 6.2.0'
   s.swift_version = '5.1'
 end

package/README.md

@@ -238,12 +238,12 @@ isIndigitallPushNotification(params: { notification: any; }) => Promise<any>
 ### logIn(...)
 
 ```typescript
-logIn(param: { externalId: string; }) => Promise<any>
+logIn(param: { externalCode: string; }) => Promise<any>
 ```
 
-| Param       | Type                                 |
-| ----------- | ------------------------------------ |
-| **`param`** | <code>{ externalId: string; }</code> |
+| Param       | Type                                   |
+| ----------- | -------------------------------------- |
+| **`param`** | <code>{ externalCode: string; }</code> |
 
 **Returns:** <code>Promise&lt;any&gt;</code>
 

package/android/build.gradle

@@ -19,10 +19,10 @@ apply plugin: 'com.android.library'
 
 android {
     namespace "com.indigitall.capacitor"
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 31
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 21
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 31
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -56,7 +56,7 @@ dependencies {
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
-    implementation('com.indigitall:android:5.2.+'){
+    implementation('com.indigitall:android:5.4.+'){
          exclude group: "com.indigitall", module: "android-hms"
     }
 }

package/android/src/main/AndroidManifest.xml

@@ -14,8 +14,8 @@
     </queries>
     <application
         android:allowBackup="true">
-    <service android:name="com.indigitall.android.services.StatisticService" />
-    <receiver android:name="com.indigitall.android.receivers.BootReceiver"
+    <service android:name="com.indigitall.android.push.services.StatisticService" />
+    <receiver android:name="com.indigitall.android.push.receivers.BootReceiver"
         android:exported="false">
         <intent-filter>
             <action android:name="android.intent.action.QUICKBOOT_POWERON" />

package/android/src/main/java/com/indigitall/capacitor/IndigitallCpPlugin.java

@@ -18,18 +18,18 @@ import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.PluginResult;
 import com.getcapacitor.annotation.CapacitorPlugin;
-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.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.commons.models.ErrorModel;
-import com.indigitall.android.models.Device;
-import com.indigitall.android.models.Permission;
-import com.indigitall.android.models.Push;
-import com.indigitall.android.models.PushErrorModel;
-import com.indigitall.android.models.Topic;
-import com.indigitall.android.utils.FirebaseUtils;
+import com.indigitall.android.push.models.Device;
+import com.indigitall.android.push.models.Permission;
+import com.indigitall.android.push.models.Push;
+import com.indigitall.android.push.models.PushErrorModel;
+import com.indigitall.android.push.models.Topic;
+import com.indigitall.android.push.utils.FirebaseUtils;
 import com.indigitall.capacitor.interfaces.IndigitallFirebaseInterface;
 import com.indigitall.capacitor.utils.CpPreferenceUtils;
 import com.indigitall.capacitor.utils.IndigitallParse;
@@ -407,7 +407,7 @@ public class IndigitallCpPlugin extends Plugin implements IndigitallFirebaseInte
 
     @PluginMethod
     public void logIn(PluginCall call) {
-        String EXTERNAL_ID = "externalId";
+        String EXTERNAL_ID = "externalCode";
         String externalId = call.getString(EXTERNAL_ID);
         IndigitallCp.logIn(getContext(), externalId, new DeviceCallback(getContext()) {
             @Override

package/android/src/main/java/com/indigitall/capacitor/IndigitallInAppPlugin.java

@@ -3,6 +3,10 @@ package com.indigitall.capacitor;
 import android.util.Log;
 import android.webkit.WebView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
@@ -14,22 +18,29 @@ import com.indigitall.android.inapp.InAppIndigitall;
 import com.indigitall.android.inapp.callbacks.GetInAppCallback;
 import com.indigitall.android.inapp.callbacks.InAppCallback;
 import com.indigitall.android.inapp.callbacks.InAppTopicCallback;
+import com.indigitall.android.inapp.callbacks.InAppTopicListCallback;
 import com.indigitall.android.inapp.callbacks.ShowInAppCallback;
 import com.indigitall.android.inapp.models.InApp;
 import com.indigitall.android.inapp.models.InAppErrorModel;
+import com.indigitall.android.inapp.models.InAppTopic;
 import com.indigitall.capacitor.implementations.InAppCp;
 import com.indigitall.capacitor.utils.IndigitallInAppParse;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+
 @CapacitorPlugin(name = "InAppCp")
 public class IndigitallInAppPlugin extends Plugin {
     private final String IN_APP = "inApp";
     private final String IN_APP_SCHEMA = "inAppSchemaCode";
     private final String TOPICS = "topics";
     private final String PARAMS = "params";
-    private final String PKN = "packageName";
+    private final String PKN = "packageNam";
+
+    private final String FORM = "form";
 
     @PluginMethod
     public void getPackageName(PluginCall call) {
@@ -62,51 +73,18 @@ public class IndigitallInAppPlugin extends Plugin {
     public void inAppWasShown(PluginCall call) throws JSONException {
         JSObject ret = new JSObject();
         String MAP_INAPP_CODE = "inAppSchemaCode";
-        InAppCp.inAppWasShown(getContext(), call.getObject(PARAMS), new GetInAppCallback() {
-            @Override
-            public void notFound() {
-                JSObject params = call.getObject(PARAMS);
-                if (params.has(MAP_INAPP_CODE)) {
-                    InAppIndigitall.inAppGet(getContext(), params.getString(MAP_INAPP_CODE), new InAppCallback(getContext()) {
-                        @Override
-                        public void onSuccess(InApp inApp) {
-                            ret.put(IN_APP, IndigitallInAppParse.jsonFromInApp(inApp));
-                            call.resolve(ret);
-                        }
-
-                        @Override
-                        public void onFail(ErrorModel errorModel) {
-                            call.reject(IndigitallInAppParse.jsonFromErrorModel(errorModel).toString());
-                        }
-                    });
-                }
-            }
-
-            @Override
-            public void didShowManyTimes(InApp inApp, InAppErrorModel inAppErrorModel) {
-                call.reject(IndigitallInAppParse.jsonFromInAppShowError(inApp, inAppErrorModel).toString());
-            }
-
-            @Override
-            public void didFound(InApp inApp) {
-                ret.put(IN_APP, IndigitallInAppParse.jsonFromInApp(inApp));
-                call.resolve(ret);
-            }
-
-            @Override
-            public void didExpired(InApp inApp, InAppErrorModel inAppErrorModel) {
-                call.reject(IndigitallInAppParse.jsonFromInAppShowError(inApp, inAppErrorModel).toString());
-            }
+        InAppCp.inAppWasShown(getContext(), call.getObject(PARAMS), new InAppCallback(getContext()) {
+          @Override
+          public void onSuccess(InApp inApp) {
+            ret.put(IN_APP, IndigitallInAppParse.jsonFromInApp(inApp));
+            call.resolve(ret);
+          }
+
+          @Override
+          public void onError(int i, String s, String s1) {
+            call.reject(s);
+          }
 
-            @Override
-            public void didDismissForever(InApp inApp, InAppErrorModel inAppErrorModel) {
-                call.reject(IndigitallInAppParse.jsonFromInAppShowError(inApp, inAppErrorModel).toString());
-            }
-
-            @Override
-            public void didClickOut(InApp inApp, InAppErrorModel inAppErrorModel) {
-                call.reject(IndigitallInAppParse.jsonFromInAppShowError(inApp, inAppErrorModel).toString());
-            }
         });
     }
 
@@ -140,7 +118,7 @@ public class IndigitallInAppPlugin extends Plugin {
         }
     }
 
-   
+
     @PluginMethod
     public void addNewInAppToDismissForever(PluginCall call) {
         try {
@@ -218,8 +196,88 @@ public class IndigitallInAppPlugin extends Plugin {
             public void onSuccess(InApp inApp) {
                 //ret.put(ACTION, "onSuccess");
             }
+
+            @Override
+            public void didFormError(InApp inApp, ArrayList<InAppErrorModel> arrayList) {
+                ret.put(ACTION, "didFormError");
+                call.resolve(ret);
+            }
+
+            @Override
+            public void didFormSubmit(InApp inApp) {
+                ret.put(ACTION, "didFormSubmit");
+                call.resolve(ret);
+            }
         });
     }
 
+  @PluginMethod
+  public void topicList(PluginCall call) throws JSONException {
+    JSObject ret = new JSObject();
+      InAppCp.topicsList(getContext(), new BaseCallback() {
+        @Override
+        public void onSuccess(JSONObject jsonObject) {
+          ret.put(TOPICS, jsonObject);
+          call.resolve(ret);
+        }
+
+        @Override
+        public void onFail(@NonNull ErrorModel errorModel) {
+          call.reject(IndigitallInAppParse.jsonFromErrorModel(errorModel).toString());
+        }
+
+      });
+  }
+
+  @PluginMethod
+  public void topicsSubscribe(PluginCall call) throws JSONException {
+    JSObject ret = new JSObject();
+    JSArray array = call.getArray(TOPICS);
+    String[] topicsList = new String[array.length()];
+    for (int i = 0; i < array.length(); i++) {
+      topicsList[i] = array.getString(i);
+    }
+    InAppCp.topicsSubscribe(getContext(), topicsList, new InAppTopicCallback() {
+      @Override
+      public void onSuccess(@NonNull String s) {
+        ret.put(TOPICS, s);
+        call.resolve(ret);
+      }
+
+      @Override
+      public void onError(@NonNull InAppErrorModel inAppErrorModel) {
+        call.reject(IndigitallInAppParse.jsonFromErrorModel(inAppErrorModel).toString());
+      }
+    });
+  }
+
+  @PluginMethod
+  public void topicsUnsubscribe(PluginCall call) throws JSONException {
+    JSObject ret = new JSObject();
+    JSArray array = call.getArray(TOPICS);
+    String[] topicsList = new String[array.length()];
+    for (int i = 0; i < array.length(); i++) {
+      topicsList[i] = array.getString(i);
+    }
+    InAppCp.topicsUnsubscribe(getContext(), topicsList, new InAppTopicCallback() {
+      @Override
+      public void onSuccess(@NonNull String s) {
+        ret.put(TOPICS, s);
+        call.resolve(ret);
+      }
+
+      @Override
+      public void onError(@NonNull InAppErrorModel inAppErrorModel) {
+        call.reject(IndigitallInAppParse.jsonFromErrorModel(inAppErrorModel).toString());
+      }
+    });
+  }
+
+  @PluginMethod
+  public void formSubmit(PluginCall call) throws JSONException {
+    JSONArray array = call.getArray(FORM);
+    InAppCp.formSubmit(getContext(), array.getJSONObject(0), array, call);
+  }
+
 }
 

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

@@ -5,13 +5,13 @@ import android.content.Context;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.indigitall.android.Indigitall;
-import com.indigitall.android.callbacks.DeviceCallback;
+import com.indigitall.android.push.callbacks.DeviceCallback;
 import com.indigitall.android.commons.models.Channel;
 import com.indigitall.android.commons.models.ErrorModel;
 import com.indigitall.android.customer.CustomerIndigitall;
 import com.indigitall.android.customer.callbacks.CustomerCallback;
 import com.indigitall.android.customer.callbacks.CustomerFieldCallback;
-import com.indigitall.android.models.Device;
+import com.indigitall.android.push.models.Device;
 import com.indigitall.capacitor.utils.IndigitallParse;
 
 import org.json.JSONArray;
@@ -51,7 +51,7 @@ public class CustomerCp {
     }
 
     public static void link(Context context, JSObject params, final CustomerCallback callback) throws JSONException{
-        String JSON_EXTERNAL_ID = "externalId";
+        String JSON_EXTERNAL_ID = "externalCode";
         String JSON_CHANNEL = "channel";
         String externalId = null;
         Channel channel = Channel.PUSH;
@@ -61,10 +61,10 @@ public class CustomerCp {
                 channel = IndigitallParse.parseChannel(Objects.requireNonNull(params.getString(JSON_CHANNEL)));
         }
         Channel finalChannel = channel;
-        Indigitall.logIn(context, externalId, new DeviceCallback(context) {
+        Indigitall.INSTANCE.logIn(context, externalId, new DeviceCallback(context) {
             @Override
             public void onSuccess(Device device) {
-                CustomerIndigitall.INSTANCE.linkCustomer(context, finalChannel, callback);
+                CustomerIndigitall.INSTANCE.link(context, finalChannel, callback);
             }
             @Override
             public void onFail(ErrorModel error) { callback.onFail(error);  }
@@ -78,10 +78,10 @@ public class CustomerCp {
                 channel = IndigitallParse.parseChannel(Objects.requireNonNull(params.getString(JSON_CHANNEL)));
         }
         Channel finalChannel = channel;
-        Indigitall.logOut(context, new DeviceCallback(context) {
+        Indigitall.INSTANCE.logOut(context, new DeviceCallback(context) {
             @Override
             public void onSuccess(Device device) {
-                CustomerIndigitall.INSTANCE.unlinkCustomer(context, finalChannel, callback);
+                CustomerIndigitall.INSTANCE.unlink(context, finalChannel, callback);
             }
 
             @Override

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

@@ -9,11 +9,13 @@ import android.view.View;
 import android.widget.ImageButton;
 
 import com.getcapacitor.JSObject;
+import com.getcapacitor.PluginCall;
 import com.indigitall.android.commons.callbacks.BaseCallback;
 import com.indigitall.android.commons.models.LogLevel;
 import com.indigitall.android.inapp.InAppConfiguration;
 import com.indigitall.android.inapp.InAppIndigitall;
 import com.indigitall.android.inapp.Utils.EventUtils;
+import com.indigitall.android.inapp.Utils.InAppFormUtils;
 import com.indigitall.android.inapp.Utils.InAppUtils;
 import com.indigitall.android.inapp.Utils.PopUpUtils;
 import com.indigitall.android.inapp.Utils.ServiceUtils;
@@ -24,39 +26,43 @@ import com.indigitall.android.inapp.callbacks.InAppTopicCallback;
 import com.indigitall.android.inapp.callbacks.ShowInAppCallback;
 import com.indigitall.android.inapp.models.InApp;
 import com.indigitall.android.inapp.models.InAppAction;
+import com.indigitall.android.inapp.models.InAppErrorModel;
+import com.indigitall.android.inapp.models.InAppForm;
+import com.indigitall.capacitor.utils.IndigitallInAppParse;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class InAppCp {
+import java.util.ArrayList;
 
+public class InAppCp {
+  private static final String IN_APP = "inApp";
     public static void inAppGet(Context context, String inAppSchemaCode, InAppCallback callback) {
         InAppIndigitall.inAppGet(context, inAppSchemaCode, callback);
     }
 
-    public static void inAppWasShown(Context context, JSObject params, GetInAppCallback callback) throws JSONException {
+    public static void inAppWasShown(Context context, JSObject params, InAppCallback callback) throws JSONException {
         String MAP_INAPP_CODE = "inAppSchemaCode";
         String MAP_DOMAIN_INAPP = "domainInApp";
         String MAP_APPKEY = "appKey";
 
         String inAppCode = null;
         String appKey = "";
-        String domainInApp = "https://device-api.indigitall.com/v2/inapp";
+        String domainInApp = "https://device-api.indigitall.com/v2/";
 
         if (params.has(MAP_INAPP_CODE)) inAppCode = params.getString(MAP_INAPP_CODE);
         if (params.has(MAP_APPKEY)) appKey = params.getString(MAP_APPKEY);
-        if (params.has(MAP_DOMAIN_INAPP)) domainInApp = params.getString(MAP_DOMAIN_INAPP)+"/inapp";
+        if (params.has(MAP_DOMAIN_INAPP)) domainInApp = params.getString(MAP_DOMAIN_INAPP);
         InAppConfiguration.Builder inAppConfiguration = new InAppConfiguration.Builder(appKey);
         inAppConfiguration.setUrlInAppApi(domainInApp);
         inAppConfiguration.setLogDebug(LogLevel.DEBUG);
         InAppConfiguration config = inAppConfiguration.build();
-        ServiceUtils.INSTANCE.registerServices(context, config);
-        config.updateConfiguration(context);
-        ShowInAppUtils.INSTANCE.inAppWasGot(context, inAppCode, callback);
+        InAppIndigitall.showCustomInApp(context, config, inAppCode, callback);
     }
 
     public static void addNewInAppClick(Context context, JSONObject json) throws JSONException {
-        InApp inApp = new InApp(json);
+        InApp inApp = new InApp(context, json);
         if (inApp.getProperties() != null && inApp.getProperties().getAction() != null) {
             Intent intent = inApp.getProperties().getAction().getIntent(context);
             boolean isAppAction = inApp.getProperties().getAction().getType() == InAppAction.Type.APP;
@@ -65,7 +71,7 @@ public class InAppCp {
     }
 
     public static void addNewInAppToDismissForever(Context context, JSONObject json) throws JSONException {
-        InApp inApp = new InApp(json);
+        InApp inApp = new InApp(context, json);
         PopUpUtils.INSTANCE.addNewInAppToDismissForever(context, inApp);
     }
 
@@ -81,11 +87,11 @@ public class InAppCp {
         ImageButton imageCloseButton = null;
         String imageCloseButtonName;
         String appKey = "";
-        String domainInApp = "https://device-api.indigitall.com/v2/inapp";
+        String domainInApp = "https://device-api.indigitall.com/v2";
 
         if (params.has(MAP_INAPP_CODE)) inAppCode = params.getString(MAP_INAPP_CODE);
         if (params.has(MAP_APPKEY)) appKey = params.getString(MAP_APPKEY);
-        if (params.has(MAP_DOMAIN_INAPP)) domainInApp = params.getString(MAP_DOMAIN_INAPP)+"/inapp";
+        if (params.has(MAP_DOMAIN_INAPP)) domainInApp = params.getString(MAP_DOMAIN_INAPP);
         if (params.has(MAP_INAPP_IMAGE_CLOSE_BUTTON)) {
             imageCloseButtonName = params.getString(MAP_INAPP_IMAGE_CLOSE_BUTTON);
             imageCloseButton = new ImageButton(context);
@@ -113,12 +119,12 @@ public class InAppCp {
     }
 
     public static void eventPrintInAppRequest(Context context, JSONObject json) throws JSONException {
-        InApp inApp = new InApp(json);
+        InApp inApp = new InApp(context, json);
         EventUtils.INSTANCE.sendEventPrint(context, inApp);
     }
 
     public static void eventClickInAppRequest(Context context, JSONObject json) throws JSONException {
-        InApp inApp = new InApp(json);
+        InApp inApp = new InApp(context, json);
         EventUtils.INSTANCE.sendEventClick(context, inApp);
     }
 
@@ -133,4 +139,37 @@ public class InAppCp {
     public static void topicsUnsubscribe(Context context, String[] topics, InAppTopicCallback callback) {
         InAppIndigitall.topicsUnsubscribe(context, topics, callback);
     }
+
+    public static void formSubmit(Context context, JSONObject json, JSONArray params, PluginCall call) throws JSONException {
+      InAppForm inAppForm = null;
+      String jsonFormat = null;
+      String jsonCustomer = null;
+      InApp inApp = new InApp(context, json);
+      if(params.get(1) != null && params.get(1) instanceof String) {
+        inAppForm = new InAppForm(new JSONObject(params.getString(1)));
+      }
+      if(params.get(2) != null && params.get(2) instanceof String) {
+        jsonFormat = params.getString(2);
+      }
+      if(params.get(3) != null && params.get(3) instanceof String) {
+        jsonCustomer = params.getString(3);
+      }
+      if (inAppForm != null && jsonFormat != null) {
+        ArrayList<InAppErrorModel> errorList = InAppFormUtils.INSTANCE.checkFieldsForm(inAppForm, new JSONObject(jsonFormat));
+        if (errorList.isEmpty()) {
+          EventUtils.INSTANCE.sendEventForm(context, inApp, new JSONObject(jsonFormat));
+          JSObject ret = new JSObject();
+          ret.put(IN_APP, IndigitallInAppParse.jsonFromInApp(inApp));
+          call.resolve(ret);
+        } else {
+          call.reject(String.valueOf(errorList));
+        }
+      }
+      if (jsonCustomer != null) {
+        JSONObject myjson = new JSONObject(jsonCustomer);
+        if (myjson.length() > 0) {
+          EventUtils.INSTANCE.sendEventFormToCustomer(context, myjson);
+        }
+      }
+    }
 }

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

@@ -5,15 +5,15 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.getcapacitor.PluginCall;
-import com.indigitall.android.Configuration;
+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.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.Push;
+import com.indigitall.android.push.utils.ServiceUtils;
 import com.indigitall.capacitor.utils.IndigitallParse;
 
 import org.json.JSONException;
@@ -68,32 +68,32 @@ public class IndigitallCp {
                     .setUrlDeviceApi(urlDeviceApi)
                     .setUrlInboxApi(urlInboxApi)
                     .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 +103,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 +144,10 @@ 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);
     }
 }

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 {