reactnative-plugin-appice 1.7.22 → 1.7.23

package/android/src/main/java/com/reactlibrary/AppICEUtils.java

@@ -1,9 +1,6 @@
 package com.reactlibrary;
 
-import android.content.Context;
-
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
@@ -16,13 +13,12 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import semusi.context.ui.appInbox.AppICEInboxMessage;
-import semusi.activitysdk.User;
+import semusi.model.campaign.Campaign;
+import semusi.model.user.User;
 
-import semusi.nativedisplay.Campaign;
 
 public class AppICEUtils {
     private static final String TAG = "AppICEUtils";
@@ -47,7 +43,7 @@ public class AppICEUtils {
         return inboxObject;
     }
 
-     /**
+    /**
      * This method accept object of native Campaign class (semusi.nativedisplay.Campaign)
      * and convert to WritableMap for hybrid side
      *
@@ -61,20 +57,20 @@ public class AppICEUtils {
                 campaignMap.putString(EnumConstants.CAMP_ID.getValue(), campaign.getCampId());
                 campaignMap.putString(EnumConstants.ACTION_URL.getValue(), campaign.getActionUrl());
                 campaignMap.putString(EnumConstants.ACTION_TYPE.getValue(), campaign.getActionType());
-    
-                JSONObject cdata = campaign.getcustomData();
+
+                JSONObject cdata = campaign.getCustomDataObject();
                 Map<String, Object> customDataMap = new HashMap<>();
                 Iterator<String> keys = cdata.keys();
-    
+
                 while (keys.hasNext()) {
                     String key = keys.next();
                     customDataMap.put(key, cdata.getString(key));
                 }
-    
+
                 campaignMap.putMap(EnumConstants.CUSTOMDATA.getValue(), toWritableMap(customDataMap));
             }
         } catch (Throwable e) {
-          
+
         }
         return campaignMap;
     }
@@ -109,7 +105,7 @@ public class AppICEUtils {
         return userObject;
     }
 
-    
+
 
     public static WritableMap toWritableMap(Map<String, Object> map) {
         WritableMap writableMap = Arguments.createMap();
@@ -270,10 +266,10 @@ public class AppICEUtils {
         return jsonObject;
     }
 
-    
+
 
     public static void printLog(String TAG, String message) {
         System.out.println(TAG + ", " + message);
     }
-    
+
 }

package/android/src/main/java/com/reactlibrary/AppIceReactPluginModule.java

@@ -23,10 +23,13 @@ import android.os.Handler;
 import semusi.activitysdk.Api;
 import semusi.activitysdk.ContextSdk;
 import semusi.activitysdk.SdkConfig;
-import semusi.activitysdk.User;
+
 import semusi.context.ui.appInbox.AppICEInboxMessage;
 import semusi.context.ui.appInbox.IAppICESuccessCallback;
 import semusi.activitysdk.IAppICEDataCallback;
+import semusi.model.campaign.Campaign;
+import semusi.model.user.User;
+
 import java.util.*;
 
 
@@ -42,12 +45,11 @@ import com.facebook.react.modules.core.DeviceEventManagerModule;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import semusi.nativedisplay.Campaign;
 
 public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
     private static ReactApplicationContext context = null;
     private static final String TAG = "AppIceReactPlugin";
-    
+
     public AppIceReactPluginModule(ReactApplicationContext reactContext) {
         super(reactContext);
         context = reactContext;
@@ -261,8 +263,8 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
                     }
                 } catch (Exception e) {
                     AppICEUtils.printLog(TAG, "setEducationType: edt issue " + e.getMessage());
-                }    
-                
+                }
+
 
                 try {
                     if (map.containsKey(EnumConstants.APPICE_USER_GENDER.getValue())) {
@@ -355,7 +357,7 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
         Context context = getReactApplicationContext();
         callback.invoke(ContextSdk.getUserId(context));
     }
-    
+
     /**
      * Get appinbox cData through mediakey
      * mediakey is a kind of key just like in json we find key value
@@ -468,7 +470,7 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
             callback.invoke(e.getMessage());
         }
     }
-	/**
+    /**
      * This method is to get user details from the given user id
      * this method takes user id in form of Array and return User class objects and return them 
      * from callback
@@ -519,7 +521,7 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
         } catch (Throwable e) {
             callback.invoke(e.getMessage());
         }
-        
+
     }
     /**
      * Get inbox messages count.
@@ -765,7 +767,7 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
         }
         catch(Throwable e){
             callback.invoke(e.getMessage());
-        }       
+        }
     }
 
     @ReactMethod

package/android/src/main/java/com/reactlibrary/EnumConstants.java

@@ -1,10 +1,13 @@
 package com.reactlibrary;
-import semusi.activitysdk.UserInfoConstants;
-import semusi.context.utility.AppICEConstants;
-import semusi.activitysdk.CustomUserPropertyConstants;
-import semusi.activitysdk.Ecommerce;
-import semusi.activitysdk.FinancialServices;
-import semusi.nativedisplay.Campaign;
+
+import static com.reactlibrary.StringConstants.*;
+
+import semusi.model.user.CustomUserPropertyConstants;
+import semusi.model.user.Ecommerce;
+import semusi.model.user.FinancialServices;
+import semusi.model.user.UserInfoConstants;
+import semusi.util.constants.CampaignConstants;
+
 //Common place for constant and SDK constants
 public enum EnumConstants {
 
@@ -87,7 +90,7 @@ public enum EnumConstants {
     ACTION_URL("ACTION_URL"),
     ACTION_TYPE("ACTION_TYPE"),
     CUSTOMDATA("CUSTOMDATA");
-   
+
     private String constants;
 
     EnumConstants(String constants) {
@@ -114,7 +117,7 @@ public enum EnumConstants {
             case "APPICE_USER_EMAIL":{
                 return UserInfoConstants.EMAIL;
             }
-            
+
             case "APPICE_DATE_OF_BIRTH":{
                 return UserInfoConstants.DATE_OF_BIRTH;
             }
@@ -125,9 +128,9 @@ public enum EnumConstants {
 
             case "APPICE_USER_EDUCATION_TYPE":{
                 return UserInfoConstants.EDUCATION_TYPE;
-            } 
+            }
+
 
-            
             case "APPICE_USER_GENDER":{
                 return UserInfoConstants.GENDER;
             }
@@ -145,59 +148,59 @@ public enum EnumConstants {
             }
 
             case "APPICE_PUSH_NOTIFICATION_CLICKED":{
-                return "AppICEPushNotificationClicked";
+                return StringConstants.APPICE_PUSH_NOTIFICATION_CLICKED;
             }
 
             case "APPICE_INAPP_NOTIFICATION_CLICKED":{
-                return "AppICEInAppClicked";
+                return StringConstants.APPICE_INAPP_NOTIFICATION_CLICKED;
             }
 
             case "INBOX_MESSAGE":{
-                return "message";
+                return StringConstants.INBOX_MESSAGE;
             }
 
             case "INBOX_TITLE":{
-                return "title";
+                return StringConstants.INBOX_TITLE;
             }
 
             case "INBOX_MESSAGE_STATUS":{
-                return "messageStatus";
+                return StringConstants.INBOX_MESSAGE_STATUS;
             }
 
             case "INBOX_CAMPAIGN_TYPE":{
-                return "campType";
+                return StringConstants.INBOX_CAMPAIGN_TYPE;
             }
 
             case "INBOX_MESSAGE_LANGUAGE":{
-                return "messageLanguage";
+                return StringConstants.INBOX_MESSAGE_LANGUAGE;
             }
 
             case "INBOX_MESSAGE_ID":{
-                return "id";
+                return StringConstants.INBOX_MESSAGE_ID;
             }
 
             case "INBOX_CAMPAIGN_ID":{
-                return "campId";
+                return StringConstants.INBOX_CAMPAIGN_ID;
             }
 
             case "INBOX_MESSAGE_CATEGORY":{
-                return "category";
+                return StringConstants.INBOX_MESSAGE_CATEGORY;
             }
 
             case "INBOX_MESSAGE_ICON":{
-                return "icon";
+                return StringConstants.INBOX_MESSAGE_ICON;
             }
 
             case "INBOX_CUSTOM_DATA":{
-                return "cdata";
+                return StringConstants.INBOX_CUSTOM_DATA;
             }
 
             case "FIRST_SEEN":{
-                return "fsn";
+                return StringConstants.FIRST_SEEN;
             }
 
             case "LAST_SEEN":{
-                return "lsn";
+                return StringConstants.LAST_SEEN;
             }
 
             case "TOP_N_PRODUCTS_VIEWED":{
@@ -259,18 +262,18 @@ public enum EnumConstants {
             case "TYPE_OF_TRANSACTION":{
                 return FinancialServices.TYPE_OF_TRANSACTION;
             }
-            
+
             case "CAMP_ID":{
-                return Campaign.CAMP_ID;
+                return CampaignConstants.CAMP_ID;
             }
             case "ACTION_URL":{
-                return Campaign.ACTION_URL;
+                return CampaignConstants.ACTION_URL;
             }
             case "ACTION_TYPE":{
-                return Campaign.ACTION_TYPE;
+                return CampaignConstants.ACTION_TYPE;
             }
             case "CUSTOMDATA":{
-                return Campaign.CUSTOMDATA;
+                return CUSTOM_DATA;
             }
             default:
                 return "";

package/android/src/main/java/com/reactlibrary/StringConstants.java

@@ -7,4 +7,19 @@ public interface StringConstants{
     String MEDIA_TYPE = "mediaType";
     String MEDIA_THUMBNAIL = "mediaThumbnail";
     String MEDIA_DATA = "mediaData";
+    String APPICE_PUSH_NOTIFICATION_CLICKED = "AppICEPushNotificationClicked";
+    String APPICE_INAPP_NOTIFICATION_CLICKED = "AppICEInAppClicked";
+    String INBOX_MESSAGE = "message";
+    String INBOX_TITLE = "title";
+    String INBOX_MESSAGE_STATUS = "messageStatus";
+    String INBOX_CAMPAIGN_TYPE = "campType";
+    String INBOX_MESSAGE_LANGUAGE = "messageLanguage";
+    String INBOX_MESSAGE_ID = "id";
+    String INBOX_CAMPAIGN_ID = "campId";
+    String INBOX_MESSAGE_CATEGORY = "category";
+    String INBOX_MESSAGE_ICON = "icon";
+    String INBOX_CUSTOM_DATA = "cdata";
+    String FIRST_SEEN = "fsn";
+    String LAST_SEEN = "lsn";
+    String CUSTOM_DATA = "cdata";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactnative-plugin-appice",
-  "version": "1.7.22",
+  "version": "1.7.23",
   "description": "appICE React Native SDK",
   "main": "index.js",
   "files": [