indigitall-capacitor-plugin 2.13.1 → 2.14.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', '~> 6.15.0'
+  s.dependency 'indigitall-ios', '~> 6.16.0'
   s.swift_version = '5.1'
 end

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 : 34
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 21
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -57,7 +57,7 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation("androidx.cardview:cardview:1.0.0")
-    implementation('com.indigitall:android:5.18.+'){
+    implementation('com.indigitall:android:5.21.+'){
          exclude group: "com.indigitall", module: "android-hms"
     }
 

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

@@ -368,7 +368,7 @@ public class IndigitallCpPlugin extends Plugin implements IndigitallFirebaseInte
                     notificationCall.resolve(ret);
                 }
             } else {
-                FirebaseUtils.INSTANCE.showNotification(getContext(), messageJson);
+                FirebaseUtils.showNotification(getContext(), messageJson);
             }
         }
     }

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

@@ -0,0 +1,156 @@
+package com.indigitall.capacitor;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.getcapacitor.JSArray;
+import com.getcapacitor.JSObject;
+import com.getcapacitor.Plugin;
+import com.getcapacitor.PluginCall;
+import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.CapacitorPlugin;
+import com.indigitall.android.liveactivity.callbacks.LACallback;
+import com.indigitall.android.liveactivity.callbacks.LADeviceCallback;
+import com.indigitall.android.liveactivity.models.LADevice;
+import com.indigitall.android.liveactivity.models.LiveActivity;
+import com.indigitall.capacitor.implementations.LiveActivityCp;
+import com.indigitall.capacitor.utils.IndigitallLAParse;
+import com.indigitall.capacitor.utils.IndigitallParse;
+
+import org.json.JSONException;
+
+import java.util.ArrayList;
+
+@CapacitorPlugin(name = "LiveActivityCp")
+public class IndigitallLAPlugin extends Plugin {
+    private final String DEVICE = "device";
+    private final String TOPICS = "topics";
+    private final String LIVE_ACTIVITIES_LIST = "liveActivities";
+
+    private final String TAG = "[IND]IndigitallLAPlugin";
+
+    @PluginMethod
+    public void logIn(PluginCall call) {
+        LiveActivityCp.logIn(getContext(),
+                call.getString("externalCode"),
+                new LADeviceCallback(getContext()) {
+                    @Override
+                    public void onSuccess(@NonNull LADevice laDevice) {
+                        JSObject ret = new JSObject();
+                        ret.put(DEVICE, IndigitallLAParse.lADeviceToMap(laDevice));
+                        call.resolve(ret);
+                    }
+
+                    @Override
+                    public void onError(@Nullable Integer integer, @Nullable String s, @Nullable String s1) {
+                        call.reject(s);
+                    }
+                });
+    }
+
+    @PluginMethod
+    public void logOut(PluginCall call) {
+        LiveActivityCp.logOut(getContext(),
+                new LADeviceCallback(getContext()) {
+                    @Override
+                    public void onSuccess(@NonNull LADevice laDevice) {
+                        JSObject ret = new JSObject();
+                        ret.put(DEVICE, IndigitallLAParse.lADeviceToMap(laDevice));
+                        call.resolve(ret);
+                    }
+
+                    @Override
+                    public void onError(@Nullable Integer integer, @Nullable String s, @Nullable String s1) {
+                        call.reject(s);
+                    }
+                });
+    }
+
+    @PluginMethod
+    public void getListLiveActivities(PluginCall call) {
+        LiveActivityCp.getListLiveActivities(
+                getContext(), new LACallback() {
+                    @Override
+                    public void onSuccess(@NonNull ArrayList<LiveActivity> arrayList) {
+                        JSObject ret = new JSObject();
+                        ret.put(LIVE_ACTIVITIES_LIST, IndigitallLAParse.liveActivityListToMap(arrayList));
+                        call.resolve(ret);
+                    }
+
+                    @Override
+                    public void onError(@Nullable Integer integer, @Nullable String s, @Nullable String s1) {
+                        call.reject(s);
+                    }
+                });
+    }
+
+    @PluginMethod
+    public void topicList(PluginCall call) {
+        LiveActivityCp.topicList(getContext(), new com.indigitall.android.liveactivity.callbacks.LATopicCallback(getContext()) {
+            @Override
+            public void onSuccess(@NonNull ArrayList<String> topics) {
+                JSObject ret = new JSObject();
+                ret.put(TOPICS, IndigitallLAParse.topicToMap(topics));
+                call.resolve(ret);
+            }
+
+            @Override
+            public void onError(@Nullable Integer integer, @Nullable String s, @Nullable String s1) {
+                call.reject(s);
+            }
+        });
+    }
+
+    @PluginMethod
+    public void topicSubscribe(PluginCall call) {
+        JSArray array = call.getArray(TOPICS);
+        ArrayList<String> topicsList = new ArrayList<String>(array.length());
+        for (int i = 0; i < array.length(); i++) {
+            try {
+                topicsList.add(array.getString(i));
+            } catch (JSONException e) {
+                android.util.Log.e(TAG, "topicSubscribe Error parsing topic: " + e.getMessage());
+            }
+        }
+        LiveActivityCp.topicSubscribe(getContext(), topicsList, new com.indigitall.android.liveactivity.callbacks.LATopicCallback(getContext()) {
+            @Override
+            public void onSuccess(@NonNull ArrayList<String> topics) {
+                JSObject ret = new JSObject();
+                ret.put(TOPICS, IndigitallLAParse.topicToMap(topics));
+                call.resolve(ret);
+            }
+
+            @Override
+            public void onError(@Nullable Integer integer, @Nullable String s, @Nullable String s1) {
+                call.reject(s);
+            }
+        });
+    }
+
+    @PluginMethod
+    public void topicUnsubscribe(PluginCall call) {
+        JSArray array = call.getArray(TOPICS);
+        ArrayList<String> topicsList = new ArrayList<String>(array.length());
+        for (int i = 0; i < array.length(); i++) {
+            try {
+                topicsList.add(array.getString(i));
+            } catch (JSONException e) {
+                android.util.Log.e(TAG, "topicUnsubscribe Error parsing topic: " + e.getMessage());
+            }
+        }
+        LiveActivityCp.topicUnsubscribe(getContext(), topicsList, new com.indigitall.android.liveactivity.callbacks.LATopicCallback(getContext()) {
+            @Override
+            public void onSuccess(@NonNull ArrayList<String> topics) {
+                JSObject ret = new JSObject();
+                ret.put(TOPICS, IndigitallLAParse.topicToMap(topics));
+                call.resolve(ret);
+            }
+
+            @Override
+            public void onError(@Nullable Integer integer, @Nullable String s, @Nullable String s1) {
+                call.reject(s);
+            }
+        });
+    }
+
+}

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

@@ -24,12 +24,12 @@ import java.util.Objects;
 public class CustomerCp {
 
     public static void getCustomer(Context context, CustomerCallback callback){
-        CustomerIndigitall.INSTANCE.getCustomer(context, callback);
+        CustomerIndigitall.getCustomer(context, callback);
     }
 
     public static void getCustomerInformation(Context context, JSArray params, final CustomerFieldCallback callback){
         ArrayList<String> fieldNames = IndigitallParse.parseArrayList(params);
-        CustomerIndigitall.INSTANCE.getCustomerInformation(context, fieldNames, callback);
+        CustomerIndigitall.getCustomerInformation(context, fieldNames, callback);
 
     }
 
@@ -40,18 +40,18 @@ public class CustomerCp {
         if (params.has("value")) value = params.getString("value");
         if (key != null && value != null) {
             json.put(key, value);
-            CustomerIndigitall.INSTANCE.updateValueToCustomerFields(context, json, callback);
+            CustomerIndigitall.updateValueToCustomerFields(context, json, callback);
         }
 
     }
 
     public static void deleteValuesFromCustomerFields(Context context, JSONArray params, final CustomerCallback callback) {
         ArrayList<String> fieldNames = IndigitallParse.parseArrayList(params);
-        CustomerIndigitall.INSTANCE.deleteValuesFromCustomerFields(context, fieldNames, callback);
+        CustomerIndigitall.deleteValuesFromCustomerFields(context, fieldNames, callback);
     }
 
     public static void sendCustomEvent(Context context, String eventCode, JSONObject customData, final CustomerCallback callback) {
-        CustomerIndigitall.INSTANCE.sendCustomEvent(context, eventCode, customData, callback);
+        CustomerIndigitall.sendCustomEvent(context, eventCode, customData, callback);
     }
 
     public static void link(Context context, JSObject params, final CustomerCallback callback) throws JSONException{
@@ -65,10 +65,10 @@ public class CustomerCp {
                 channel = IndigitallParse.parseChannel(Objects.requireNonNull(params.getString(JSON_CHANNEL)));
         }
         Channel finalChannel = channel;
-        Indigitall.INSTANCE.logIn(context, externalId, new DeviceCallback(context) {
+        Indigitall.logIn(context, externalId, new DeviceCallback(context) {
             @Override
             public void onSuccess(Device device) {
-                CustomerIndigitall.INSTANCE.link(context, finalChannel, callback);
+                CustomerIndigitall.link(context, finalChannel, callback);
             }
             @Override
             public void onFail(ErrorModel error) { callback.onFail(error);  }
@@ -82,10 +82,10 @@ public class CustomerCp {
                 channel = IndigitallParse.parseChannel(Objects.requireNonNull(params.getString(JSON_CHANNEL)));
         }
         Channel finalChannel = channel;
-        Indigitall.INSTANCE.logOut(context, new DeviceCallback(context) {
+        Indigitall.logOut(context, new DeviceCallback(context) {
             @Override
             public void onSuccess(Device device) {
-                CustomerIndigitall.INSTANCE.unlink(context, finalChannel, callback);
+                CustomerIndigitall.unlink(context, finalChannel, callback);
             }
 
             @Override

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

@@ -24,6 +24,8 @@ 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.ShowInAppCallback;
+import com.indigitall.android.inapp.dao.InAppDatabase;
+import com.indigitall.android.inapp.dao.inApp.InAppDao;
 import com.indigitall.android.inapp.models.InApp;
 import com.indigitall.android.inapp.models.InAppAction;
 import com.indigitall.android.inapp.models.InAppErrorModel;
@@ -67,22 +69,27 @@ public class InAppCp {
     }
 
     public static void addNewInAppClick(Context context, JSONObject json) throws JSONException {
-        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;
+        InApp inAppFromClick = new InApp(context, json);
+        InAppDatabase mDb = new InAppDatabase(context).open();
+        InApp inAppFromDB = null;
+        if (mDb.getMInAppDao() != null) inAppFromDB = mDb.getMInAppDao().searchInAppWithInAppIdAndSchema(inAppFromClick.getInAppId(), inAppFromClick.getSchema().getCode());
+        if (inAppFromClick.getProperties() != null && inAppFromClick.getProperties().getAction() != null) {
+            Intent intent = inAppFromClick.getProperties().getAction().getIntent(context);
+            boolean isAppAction = inAppFromClick.getProperties().getAction().getType() == InAppAction.Type.APP;
             if (isAppAction && CpPreferenceUtils.isNotAction(context)) {
-                EventUtils.INSTANCE.sendEventClick(context, inApp);
-                ShowInAppUtils.INSTANCE.addNewInAppClick(context, inApp);
+                EventUtils.sendEventClick(context, inAppFromClick);
+                InApp inApp = inAppFromClick;
+                if (inAppFromDB != null) inApp = inAppFromDB;
+                ShowInAppUtils.addNewInAppClick(context, inApp);
             } else {
-                InAppUtils.INSTANCE.inAppWasClicked(context, inApp, inApp.getProperties().getAction(), intent, isAppAction);
+                InAppUtils.inAppWasClicked(context, inAppFromClick, inAppFromClick.getProperties().getAction(), intent, isAppAction);
             }
         }
     }
 
     public static void addNewInAppToDismissForever(Context context, JSONObject json) throws JSONException {
         InApp inApp = new InApp(context, json);
-        PopUpUtils.INSTANCE.addNewInAppToDismissForever(context, inApp);
+        PopUpUtils.addNewInAppToDismissForever(context, inApp);
     }
 
     public static void showPopUp(Context context, JSONObject params, Activity activity, CpShowInAppCallback callback) throws JSONException {
@@ -120,7 +127,7 @@ public class InAppCp {
             inAppConfiguration.setUrlInAppApi(domainInApp);
             inAppConfiguration.setClosePopupWhenClicked(closePopupWhenClicked);
             InAppConfiguration config = inAppConfiguration.build();
-            ServiceUtils.INSTANCE.registerServices(context, config);
+            ServiceUtils.registerServices(context, config);
             config.updateConfiguration(context);
 
             CpInAppIndigitall.showPopUp(
@@ -137,12 +144,12 @@ public class InAppCp {
 
     public static void eventPrintInAppRequest(Context context, JSONObject json) throws JSONException {
         InApp inApp = new InApp(context, json);
-        EventUtils.INSTANCE.sendEventPrint(context, inApp);
+        EventUtils.sendEventPrint(context, inApp);
     }
 
     public static void eventClickInAppRequest(Context context, JSONObject json) throws JSONException {
         InApp inApp = new InApp(context, json);
-        EventUtils.INSTANCE.sendEventClick(context, inApp);
+        EventUtils.sendEventClick(context, inApp);
     }
 
     public static void topicsList(Context context, BaseCallback callback) {
@@ -176,9 +183,9 @@ public class InAppCp {
         jsonCustomer = params.getString(3);
       }
       if (inAppForm != null && jsonFormat != null) {
-        ArrayList<InAppErrorModel> errorList = InAppFormUtils.INSTANCE.checkFieldsForm(inAppForm, new JSONObject(jsonFormat));
+        ArrayList<InAppErrorModel> errorList = InAppFormUtils.checkFieldsForm(inAppForm, new JSONObject(jsonFormat));
         if (errorList.isEmpty()) {
-          EventUtils.INSTANCE.sendEventForm(context, inApp, new JSONObject(jsonFormat));
+          EventUtils.sendEventForm(context, inApp, new JSONObject(jsonFormat));
           JSObject ret = new JSObject();
           ret.put(IN_APP, IndigitallInAppParse.jsonFromInApp(inApp));
           call.resolve(ret);
@@ -189,7 +196,7 @@ public class InAppCp {
       if (jsonCustomer != null) {
         JSONObject myjson = new JSONObject(jsonCustomer);
         if (myjson.length() > 0) {
-          EventUtils.INSTANCE.sendEventFormToCustomer(context, myjson);
+          EventUtils.sendEventFormToCustomer(context, myjson);
         }
       }
     }

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

@@ -73,7 +73,7 @@ public class InboxCp implements InboxAuthListener {
         if (status != null) {
             if (myInbox != null) myInbox.massiveEditNotificationsWithInitialStatus(context, sendingIdList, getStatus(initialStatus), getStatus(status), callback);
         }else{
-            callback.onFail(ErrorUtils.INSTANCE.showError(3004,"No status params"));
+            callback.onFail(ErrorUtils.showError(3004,"No status params"));
         }
     }
 

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

@@ -160,32 +160,32 @@ public class IndigitallCp {
               .setTimeoutRequestsInMilliseconds(timeoutRequestsInMilliseconds)
               .setBackgroundRequestsDisabled(backgroundRequestsDisabled)
               .build();
-            Indigitall.INSTANCE.init(context,config, callback);
+            Indigitall.init(context,config, callback);
         }
     }
 
     public static void deviceGet(Context context, DeviceCallback callback) {
-        Indigitall.INSTANCE.deviceGet(context, callback);
+        Indigitall.deviceGet(context, callback);
     }
 
     public static void deviceEnable(Context context, DeviceCallback callback) {
-        Indigitall.INSTANCE.deviceEnable(context, callback);
+        Indigitall.deviceEnable(context, callback);
     }
 
     public static void deviceDisable(Context context, DeviceCallback callback) {
-        Indigitall.INSTANCE.deviceDisable(context, callback);
+        Indigitall.deviceDisable(context, callback);
     }
 
     public static void topicsList(Context context, TopicsCallback callback) {
-        Indigitall.INSTANCE.topicsList(context, callback);
+        Indigitall.topicsList(context, callback);
     }
 
     public static void topicsSubscribe(Context context, String[] topics, TopicsCallback callback) {
-        Indigitall.INSTANCE.topicsSubscribe(context, topics, callback);
+        Indigitall.topicsSubscribe(context, topics, callback);
     }
 
     public static void topicsUnsubscribe(Context context, String[] topics, TopicsCallback callback) {
-        Indigitall.INSTANCE.topicsUnsubscribe(context, topics, callback);
+        Indigitall.topicsUnsubscribe(context, topics, callback);
     }
 
     public static void sendCustomEvent(Context context, JSONObject json, EventCallback callback)  throws JSONException {
@@ -195,7 +195,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.INSTANCE.sendCustomEvent(context, eventCustom, eventCustomData, callback);
+        Indigitall.sendCustomEvent(context, eventCustom, eventCustomData, callback);
     }
 
     public static JSONObject getPush(Context context, Intent intent) throws JSONException {
@@ -223,7 +223,7 @@ public class IndigitallCp {
             Push push = new Push(json);
             call.setKeepAlive(true);
             JSObject ret = new JSObject();
-            ret.put("state", PushServiceUtils.INSTANCE.isPushSecure(context, push));
+            ret.put("state", PushServiceUtils.isPushSecure(context, push));
             call.resolve(ret);
         } catch (Exception ex) {
             call.reject("Error isPushSecure:" + ex.getLocalizedMessage());
@@ -248,14 +248,14 @@ public class IndigitallCp {
     }
 
     public static void logIn(Context context, String externalId, DeviceCallback callback) {
-        Indigitall.INSTANCE.logIn(context, externalId, callback);
+        Indigitall.logIn(context, externalId, callback);
     }
 
     public static void logOut(Context context, DeviceCallback callback) {
-        Indigitall.INSTANCE.logOut(context, callback);
+        Indigitall.logOut(context, callback);
     }
 
     public static void onRequestPermissionsResult(Context context, int requestCode, String[] permissions, int[] grantResults) {
-        Indigitall.INSTANCE.onRequestPermissionsResult(context, requestCode, permissions, grantResults);
+        Indigitall.onRequestPermissionsResult(context, requestCode, permissions, grantResults);
     }
 }

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

@@ -0,0 +1,51 @@
+package com.indigitall.capacitor.implementations;
+
+import android.content.Context;
+
+import com.indigitall.android.liveactivity.IndigitallLA;
+import com.indigitall.android.liveactivity.callbacks.LACallback;
+import com.indigitall.android.liveactivity.callbacks.LADeviceCallback;
+import com.indigitall.android.liveactivity.callbacks.LATopicCallback;
+
+import org.json.JSONArray;
+
+import java.util.ArrayList;
+
+public class LiveActivityCp {
+
+    public static void logIn(Context context,
+                            String externalCode,
+                             LADeviceCallback callback
+    ) {
+        IndigitallLA.login(context, externalCode, callback);
+    }
+
+    public static void logOut(Context context,
+                             LADeviceCallback callback
+    ) {
+        IndigitallLA.logOut(context, callback);
+    }
+
+    public static void getListLiveActivities(Context context,
+                                             LACallback callback
+    ) {
+        IndigitallLA.getListLiveActivities(context, callback);
+    }
+
+    public static void topicList(Context context,
+                                 LATopicCallback callback) {
+        IndigitallLA.topicList(context, callback);
+    }
+
+    public static void topicSubscribe(Context context,
+                                      ArrayList<String> topics,
+                                      LATopicCallback callback) {
+        IndigitallLA.subscribeToTopic(context, topics, callback);
+    }
+
+    public static  void topicUnsubscribe(Context context,
+                                         ArrayList<String> topics,
+                                         LATopicCallback callback) {
+        IndigitallLA.unsubscribeToTopic(context, topics, callback);
+    }
+}

package/android/src/main/java/com/indigitall/capacitor/inapp/CpInAppIndigitall.java

@@ -55,11 +55,11 @@ public class CpInAppIndigitall {
         InAppClient.getApplicationWithInAppChannel(context, new InAppApplicationRequest(context), new InAppApplicationCallback(context, TAG) {
             @Override
             public void onSuccess(@NonNull InAppApplication inAppApplication) {
-                if (InAppAudienceUtils.INSTANCE.isAudienceCacheFinish(context)) {
+                if (InAppAudienceUtils.isAudienceCacheFinish(context)) {
                     InAppClient.getAudiences(new InAppAudiencesRequest(context), new InAppAudienceCallback(context) {
                         @Override
                         public void onSuccess(@NonNull InAppAudience audience) {
-                            InAppAudienceUtils.INSTANCE.saveAudienceCache(context, inAppApplication.getAudienceDeviceTtl());
+                            InAppAudienceUtils.saveAudienceCache(context, inAppApplication.getAudienceDeviceTtl());
                             inAppValidations(context, view, inAppCode, closeIcon, closeIconDisabled, show);
                         }
 
@@ -89,8 +89,8 @@ public class CpInAppIndigitall {
             ImageButton closeIcon,
             boolean closeIconDisabled,
             CpShowInAppCallback show) {
-        if (InAppValidations.INSTANCE.isValidFormatRequest(context)) {
-            ShowInAppUtils.INSTANCE.inAppWithFilters(
+        if (InAppValidations.isValidFormatRequest(context)) {
+            ShowInAppUtils.inAppWithFilters(
                     context,
                     inAppCode,
                     view,
@@ -156,7 +156,7 @@ public class CpInAppIndigitall {
         InAppIndigitall.inAppGet(context, inAppCode, new InAppCallback(context) {
             @Override
             public void onSuccess(InApp inApp) {
-                InApp newInApp = ShowInAppUtils.INSTANCE.addNewInApp(context, inApp);
+                InApp newInApp = ShowInAppUtils.addNewInApp(context, inApp);
                 showPopUp(
                         context,
                         view,
@@ -228,15 +228,15 @@ public class CpInAppIndigitall {
                     hole.addJavascriptInterface(new WebCpInAppInterface(context, inApp, popupWindow, show), INDIGITALL_INTERFACE);
                     hole.loadDataWithBaseURL(
                             null,
-                            htmlFinal + InAppConstants.Companion.getSCRIPT(),
-                            InAppConstants.Companion.getMIME_TYPE_INFO(),
-                            InAppConstants.Companion.getUTF8(),
+                            htmlFinal + InAppConstants.SCRIPT,
+                            InAppConstants.MIME_TYPE_INFO,
+                            InAppConstants.UTF8,
                             null
                     );
                 }catch (Exception ex) {
                     ex.printStackTrace();
                 } finally {
-                    EventUtils.INSTANCE.sendEventPrint(context, inApp);
+                    EventUtils.sendEventPrint(context, inApp);
                 }
             }
         });

package/android/src/main/java/com/indigitall/capacitor/inapp/CpInAppPopUp.java

@@ -111,7 +111,7 @@ public class CpInAppPopUp {
                     @Override
                     public void onClick(View v) {
                         if (inApp.getProperties().getDismissForever()) {
-                            PopUpUtils.INSTANCE.addNewInAppToDismissForever(context, inApp);
+                            PopUpUtils.addNewInAppToDismissForever(context, inApp);
                         }
                         if (show != null) show.didClosed();
                         popupWindow.dismiss();
@@ -122,9 +122,9 @@ public class CpInAppPopUp {
             if (show != null) show.onSuccess(inApp);
 
             float density = context.getResources().getDisplayMetrics().density;
-            float width = PopUpUtils.INSTANCE.changeToDP(context, inApp.getSchema().getWidth()*density);
-            float height = PopUpUtils.INSTANCE.changeToDP(context,inApp.getSchema().getHeight()*density);
-            double aspectRadio = PopUpUtils.INSTANCE.scalePopUp(width, height);
+            float width = PopUpUtils.changeToDP(context, inApp.getSchema().getWidth()*density);
+            float height = PopUpUtils.changeToDP(context,inApp.getSchema().getHeight()*density);
+            double aspectRadio = PopUpUtils.scalePopUp(width, height);
             popupWindow.setWidth((int)(width*aspectRadio));
             popupWindow.setHeight((int)(height*aspectRadio));
 
@@ -171,7 +171,7 @@ public class CpInAppPopUp {
                                 new Handler(Looper.getMainLooper()).post(new Runnable() {
                                     @Override
                                     public void run() {
-                                        if (InAppPreferenceUtils.INSTANCE.getClosePopupWhenClicked(context)) popupWindow.dismiss();
+                                        if (InAppPreferenceUtils.getClosePopupWhenClicked(context)) popupWindow.dismiss();
                                     }
                                 });
                                 if (show != null) show.didClicked(inApp, action);
@@ -182,7 +182,7 @@ public class CpInAppPopUp {
                                 new Handler(Looper.getMainLooper()).post(new Runnable() {
                                     @Override
                                     public void run() {
-                                        if (InAppPreferenceUtils.INSTANCE.getClosePopupWhenClicked(context)) popupWindow.dismiss();
+                                        if (InAppPreferenceUtils.getClosePopupWhenClicked(context)) popupWindow.dismiss();
                                     }
                                 });
                                 if (show != null) show.didClicked();

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

@@ -83,11 +83,20 @@ public class IndigitallInAppPlugin extends Plugin {
             call.resolve(ret);
           }
 
-          @Override
+        @Override
+        public void onFail(ErrorModel errorModel) {
+            super.onFail(errorModel);
+            String code = "2100";
+            if (errorModel.getErrorCode().getErrorId() != null) {
+                code = errorModel.getErrorCode().getErrorId().toString();
+            }
+            call.reject(errorModel.getErrorMessage().getErrorMessage(), code);
+        }
+
+            @Override
           public void onError(int i, String s, String s1) {
-            call.reject(s);
+              call.reject(s, String.valueOf(i));
           }
-
         });
     }
 

package/android/src/main/java/com/indigitall/capacitor/inapp/interfaces/WebCpInAppInterface.java

@@ -39,14 +39,14 @@ public class WebCpInAppInterface {
                 boolean isAppAction =  action.getType() == CoreAction.Type.APP;
                 if (CpPreferenceUtils.isNotAction(context) && isAppAction) {
                     inApp.getProperties().setAction(action);
-                    ShowInAppUtils.INSTANCE.addNewInAppClick(context, inApp);
-                    EventUtils.INSTANCE.sendEventClick(context, inApp);
+                    ShowInAppUtils.addNewInAppClick(context, inApp);
+                    EventUtils.sendEventClick(context, inApp);
                     if (show != null) {
                         show.didClicked(popupWindow, inApp, action);
                         show.didClicked(inApp, action);
                     }
                 } else {
-                    if (InAppUtils.INSTANCE.inAppWasClicked(context, inApp, action, intentAction, isAppAction)) {
+                    if (InAppUtils.inAppWasClicked(context, inApp, action, intentAction, isAppAction)) {
                         if (show != null) show.didClicked(popupWindow, inApp, action);
                     } else {
                         if (show != null) show.onFail(String.valueOf(inApp.getInAppId()), null, "WebCDVInAppInterface inAppWasClicked error");

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

@@ -29,7 +29,7 @@ public class IndigitallFirebaseMessagingService extends FirebaseMessagingService
 
     @Override
     public void onNewToken(String s) {
-        FirebaseUtils.INSTANCE.setPushToken(this);
+        FirebaseUtils.setPushToken(this);
         super.onNewToken(s);
     }