reactnative-plugin-appice 1.7.10 → 1.7.11

package/android/build.gradle

@@ -114,8 +114,7 @@ dependencies {
     annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.3.1"
 
     //appice
-    implementation 'appice.io.android:sdk:2.5.76'
-    //implementation files('libs/libsdk-release.aar')
+    implementation 'appice.io.android:sdk:2.5.77'
 
     //glide
     implementation "com.github.bumptech.glide:glide:4.11.0"

package/android/src/main/AndroidManifest.xml

@@ -5,7 +5,6 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
-
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />

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

@@ -1,6 +1,9 @@
 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;
@@ -12,6 +15,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -21,7 +25,7 @@ import semusi.activitysdk.User;
 public class AppICEUtils {
     private static final String TAG = "AppICEUtils";
 
-    public static WritableMap convertClassToWritableMap(AppICEInboxMessage inboxMessage){
+    public static WritableMap convertClassToWritableMap(AppICEInboxMessage inboxMessage) {
         WritableMap inboxObject = Arguments.createMap();
         try {
             if (inboxMessage != null) {
@@ -35,17 +39,20 @@ public class AppICEUtils {
                 inboxObject.putString(EnumConstants.INBOX_MESSAGE.getValue(), inboxMessage.getMessageBody());
                 inboxObject.putString(EnumConstants.INBOX_MESSAGE_ICON.getValue(), inboxMessage.getMessageIcon());
                 inboxObject.putMap(EnumConstants.INBOX_CUSTOM_DATA.getValue(), toWritableMap(inboxMessage.getCustomData()));
-                }
-        }catch (Throwable throwable){}
+            }
+        } catch (Throwable throwable) {
+        }
         return inboxObject;
     }
-	/**
+
+    /**
      * This method accept object of native User class (semusi.activitysdk.User)
      * and convert to WritableMap for hybrid side
+     *
      * @param user object of native User class
      * @return WritableMap
      */
-    public static WritableMap convertUserClassToWritableMap(User user){
+    public static WritableMap convertUserClassToWritableMap(User user) {
         WritableMap userObject = Arguments.createMap();
         try {
             if (user != null) {
@@ -67,6 +74,7 @@ public class AppICEUtils {
         }
         return userObject;
     }
+
     public static WritableMap toWritableMap(Map<String, Object> map) {
         WritableMap writableMap = Arguments.createMap();
         Iterator iterator = map.entrySet().iterator();
@@ -151,7 +159,7 @@ public class AppICEUtils {
         }
         return array;
     }
-    
+
     /**
      * @param propsMap took data from js and iterate it and store in hashmap
      * @return map of the props data
@@ -173,10 +181,10 @@ public class AppICEUtils {
                     props.put(key, propsMap.getBoolean(key));
                 } else if (readableType == ReadableType.Number) {
                     try {
-                        props.put(key, propsMap.getDouble(key));
+                        props.put(key, propsMap.getInt(key));
                     } catch (Throwable t) {
                         try {
-                            props.put(key, propsMap.getInt(key));
+                            props.put(key, propsMap.getDouble(key));
                         } catch (Throwable t1) {
                             AppICEUtils.printLog(TAG, "Unhandled ReadableType.Number from ReadableMap");
                         }
@@ -191,7 +199,44 @@ public class AppICEUtils {
         return props;
     }
 
-    public static void printLog(String TAG, String message){
-        System.out.println(TAG+", "+message);
+    public static JSONObject toJSONObject(ReadableMap readableMap) {
+        JSONObject jsonObject = new JSONObject();
+
+        try {
+            ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
+
+            while (iterator.hasNextKey()) {
+                String key = iterator.nextKey();
+                ReadableType type = readableMap.getType(key);
+
+                switch (type) {
+                    case Null:
+                        jsonObject.put(key, null);
+                        break;
+                    case Boolean:
+                        jsonObject.put(key, readableMap.getBoolean(key));
+                        break;
+                    case Number:
+                        jsonObject.put(key, readableMap.getDouble(key));
+                        break;
+                    case String:
+                        jsonObject.put(key, readableMap.getString(key));
+                        break;
+                    case Map:
+                        jsonObject.put(key, toJSONObject(readableMap.getMap(key)));
+                        break;
+                }
+            }
+        }catch (Throwable t){
+            return jsonObject;
+        }
+
+        return jsonObject;
+    }
+
+    
+
+    public static void printLog(String TAG, String message) {
+        System.out.println(TAG + ", " + message);
     }
 }

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

@@ -2,6 +2,10 @@ package com.reactlibrary;
 
 import static com.reactlibrary.AppICEUtils.arrayListStringFromReadableArray;
 import static com.reactlibrary.AppICEUtils.eventPropsFromReadableMap;
+import static com.reactlibrary.StringConstants.MEDIA_DATA;
+import static com.reactlibrary.StringConstants.MEDIA_THUMBNAIL;
+import static com.reactlibrary.StringConstants.MEDIA_TYPE;
+import static com.reactlibrary.StringConstants.MEDIA_URL;
 
 import android.content.Context;
 import android.content.Intent;
@@ -30,10 +34,14 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
     private static ReactApplicationContext context = null;
     private static final String TAG = "AppIceReactPlugin";
@@ -235,25 +243,25 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
 
                 try {
                     if (map.containsKey(EnumConstants.APPICE_DATE_OF_BIRTH.getValue())) {
-                        Object age = map.get(EnumConstants.APPICE_DATE_OF_BIRTH.getValue());
-                        if (age != null) {
-                            user.setDob((Integer) age);
+                        Object dob = map.get(EnumConstants.APPICE_DATE_OF_BIRTH.getValue());
+                        if (dob != null) {
+                            user.setDob((Integer) dob);
                         }
                     }
                 } catch (Exception e) {
                     AppICEUtils.printLog(TAG, "setUser: dob issue " + e.getMessage());
                 }
-
                 try {
-                    if (map.containsKey(EnumConstants.APPICE_USER_EDUCATION.getValue())) {
-                        Object ed = map.get(EnumConstants.APPICE_USER_EDUCATION.getValue());
-                        if (ed != null) {
-                            user.setEducationType(ed.toString());
+                    if (map.containsKey(EnumConstants.APPICE_USER_EDUCATION_TYPE.getValue())) {
+                        Object edt = map.get(EnumConstants.APPICE_USER_EDUCATION_TYPE.getValue());
+                        if (edt != null) {
+                            user.setEducationType(edt.toString());
                         }
                     }
                 } catch (Exception e) {
-                    AppICEUtils.printLog(TAG, "setUser: ed issue " + e.getMessage());
-                }
+                    AppICEUtils.printLog(TAG, "setEducationType: edt issue " + e.getMessage());
+                }    
+                
 
                 try {
                     if (map.containsKey(EnumConstants.APPICE_USER_GENDER.getValue())) {
@@ -355,22 +363,15 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
      * @Callback will recive Map<String, Object> object
      */
     @ReactMethod
-    public void getMediaData(ReadableMap inboxMessage,String mediayKey,Callback callback) {
-        
-        Context context = getReactApplicationContext();
-        AppICEInboxMessage inboxMessageInstance = AppICEInboxMessage.getAppICEInboxMessage(inboxMessage.toString(),context);
-        if (inboxMessageInstance != null) {
-            Map<String, Object> map = inboxMessageInstance.getMediaData(mediayKey);
-            if (map != null) {
-                callback.invoke(AppICEUtils.toWritableMap(map), null);
-            } else {
-                callback.invoke(null, StringConstants.FAILED_RETRIVE_MEDIA_DATA);
-            }
-        } else {
-            callback.invoke(null, StringConstants.INVALID_INBOX_FORMAT);
+    public void getMediaData(ReadableMap inboxMessage, String mediayKey, Callback callback) {
+        try {
+            Context context = getReactApplicationContext();
+            getMediaApiHelper(inboxMessage,null, MEDIA_DATA, mediayKey, callback, context);
+        } catch (Throwable e) {
         }
     }
 
+
     /**
      * To get Media URL from getMediaData 
      * inboxMessage {AppICEInboxMessage as a ReadableMap}
@@ -378,52 +379,37 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
      * @callback callback will receive mediaUrl{string}
      */
     @ReactMethod
-    public void getMediaUrl(ReadableMap inboxMessage,ReadableMap mediaData,Callback callback) {
-		Context context = getReactApplicationContext();
-        AppICEInboxMessage inboxMessageInstance = AppICEInboxMessage.getAppICEInboxMessage(inboxMessage.toString(),context);
-        if(inboxMessageInstance != null){
-            String mediaUrl = inboxMessageInstance.getMediaUrl(AppICEUtils.eventPropsFromReadableMap(mediaData));
-            callback.invoke(mediaUrl, null);
-        } else{
-            callback.invoke(null, StringConstants.INVALID_INBOX_FORMAT);
-        }
+    public void getMediaUrl(ReadableMap inboxMessage, ReadableMap mediaData, Callback callback) {
+        Context context = getReactApplicationContext();
+        getMediaApiHelper(inboxMessage, mediaData, MEDIA_URL,"", callback, context);
     }
-     /**
-     * To get Media type from customdata 
+
+    /**
+     * To get Media type from customdata
      * inboxMessage {AppICEInboxMessage as a ReadableMap}
      * mediaData customData : this we will recived from getmediadata callback
+     *
      * @callback callback will receive mediaType{string}
      */
     @ReactMethod
-    public void getMediaType(ReadableMap inboxMessage,ReadableMap mediaData,Callback callback) {
-		Context context = getReactApplicationContext();
-        AppICEInboxMessage inboxMessageInstance = AppICEInboxMessage.getAppICEInboxMessage(inboxMessage.toString(),context);
-        if(inboxMessageInstance != null){
-            String mediaType = inboxMessageInstance.getMediaType(AppICEUtils.eventPropsFromReadableMap(mediaData));
-            callback.invoke(mediaType, null);
-        } else{
-            callback.invoke(null, StringConstants.INVALID_INBOX_FORMAT);
-        }
+    public void getMediaType(ReadableMap inboxMessage, ReadableMap mediaData, Callback callback) {
+        Context context = getReactApplicationContext();
+        getMediaApiHelper(inboxMessage, mediaData, MEDIA_TYPE, "", callback, context);
     }
+
     /**
-     * To get Media Thumbnail from customdata 
+     * To get Media Thumbnail from customdata
      * inboxMessage {AppICEInboxMessage as a ReadableMap}
      * mediaData customData : this we will recived from getmediadata callback
+     *
      * @callback callback will receive Thumbnail{string}
      */
     @ReactMethod
-    public void getMediaThumbnail(ReadableMap inboxMessage,ReadableMap mediaData,Callback callback) {
-		Context context = getReactApplicationContext();
-        AppICEInboxMessage inboxMessageInstance = AppICEInboxMessage.getAppICEInboxMessage(inboxMessage.toString(),context);
-        if(inboxMessageInstance != null){
-            String mediaThumbnail = inboxMessageInstance.getMediaThumbnail(AppICEUtils.eventPropsFromReadableMap(mediaData));
-            callback.invoke(mediaThumbnail, null);
-        } else{
-            callback.invoke(null, StringConstants.INVALID_INBOX_FORMAT);
-        }
+    public void getMediaThumbnail(ReadableMap inboxMessage, ReadableMap mediaData, Callback callback) {
+        Context context = getReactApplicationContext();
+        getMediaApiHelper(inboxMessage, mediaData, MEDIA_THUMBNAIL, "",callback, context);
     }
 
-
     //======================
     // LISTENER
     //======================
@@ -493,8 +479,11 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
         Context context = getReactApplicationContext();
         WritableArray writableArray = Arguments.createArray();
         try {
-            // convert ReadableArray (Hybrid) to ArrayList<String> (Native)
-            ArrayList<String> finalValues = arrayListStringFromReadableArray(userIds);
+            ArrayList<String> finalValues = null;
+            if (userIds != null) {
+                // convert ReadableArray (Hybrid) to ArrayList<String> (Native)
+                finalValues = arrayListStringFromReadableArray(userIds);
+            }
             // get list of user class object from native sdk
             List<User> users = ContextSdk.getUser(finalValues,context);
             for (int i = 0; i < users.size(); i++) {
@@ -508,7 +497,7 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
             callback.invoke(e.getMessage());
         }
     }
-	/**
+    /**
      * To sync up data with server
      * callback will have boolean true or false
      */
@@ -695,4 +684,66 @@ public class AppIceReactPluginModule extends ReactContextBaseJavaModule {
             AppICEUtils.printLog(TAG, "java.lang.RuntimeException: Trying to invoke JS before CatalystInstance has been set!" + e);
         }
     }
+    private static AppICEInboxMessage getMediaPreProcessing(ReadableMap inboxMessage,Context context) {
+        AppICEInboxMessage appICEInboxMessage = null;
+        JSONObject inboxJSON = AppICEUtils.toJSONObject(inboxMessage);
+        if (inboxJSON != null && inboxJSON.length()>0) {
+            appICEInboxMessage = AppICEInboxMessage.getAppICEInboxMessage(inboxJSON.toString(), context);
+            if (appICEInboxMessage != null) {
+                return appICEInboxMessage;
+            }
+        }
+        return appICEInboxMessage;
+    }
+
+    public static void getMediaApiHelper(ReadableMap inboxMessage, ReadableMap mediaData, String type, String mediayKey, Callback callback, Context context){
+
+        AppICEInboxMessage appICEInboxMessage = getMediaPreProcessing(inboxMessage, context);
+        if (appICEInboxMessage != null) {
+            switch (type) {
+                case "mediaType": {
+                    if (mediaData != null){
+                        String mediaType = appICEInboxMessage.getMediaType(AppICEUtils.eventPropsFromReadableMap(mediaData));
+                        callback.invoke(mediaType, null);
+                    }else
+                        callback.invoke(null, StringConstants.FAILED_RETRIVE_MEDIA_DATA);
+                    break;
+                }
+
+                case "mediaUrl": {
+                    if (mediaData != null) {
+                        String mediaUrl = appICEInboxMessage.getMediaUrl(AppICEUtils.eventPropsFromReadableMap(mediaData));
+                        callback.invoke(mediaUrl, null);
+                    }else
+                        callback.invoke(null, StringConstants.FAILED_RETRIVE_MEDIA_DATA);
+                    break;
+                }
+
+                case "mediaThumbnail": {
+                    if (mediaData != null) {
+                        String mediaThumbnail = appICEInboxMessage.getMediaThumbnail(AppICEUtils.eventPropsFromReadableMap(mediaData));
+                        callback.invoke(mediaThumbnail, null);
+                    }else
+                        callback.invoke(null, StringConstants.FAILED_RETRIVE_MEDIA_DATA);
+                    break;
+                }
+
+                case "mediaData":{
+                    if (mediayKey != null) {
+                        Map<String, Object> map = appICEInboxMessage.getMediaData(mediayKey);
+                        if (map != null) {
+                            callback.invoke(AppICEUtils.toWritableMap(map), null);
+                        } else {
+                            callback.invoke(null, StringConstants.FAILED_RETRIVE_MEDIA_DATA);
+                        }
+                    }else{
+                        callback.invoke(null, StringConstants.INVALID_INBOX_FORMAT);
+                    }
+                }
+            }
+        }else {
+            callback.invoke(null, StringConstants.INVALID_INBOX_FORMAT);
+        }
+
+    }
 }

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

@@ -117,10 +117,7 @@ public enum EnumConstants {
                 return UserInfoConstants.EDUCATION_TYPE;
             } 
 
-            case "APPICE_USER_EDUCATION":{
-                return "ed";
-            }
-
+            
             case "APPICE_USER_GENDER":{
                 return UserInfoConstants.GENDER;
             }
@@ -150,7 +147,7 @@ public enum EnumConstants {
             }
 
             case "INBOX_TITLE":{
-                return AppICEConstants.TITLE;
+                return "title";
             }
 
             case "INBOX_MESSAGE_STATUS":{

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

@@ -1,5 +1,10 @@
 package com.reactlibrary;
-public class StringConstants{
-    public static final String FAILED_RETRIVE_MEDIA_DATA = "Failed to retrieve media data";
-    public static final String INVALID_INBOX_FORMAT = "Invalid inbox message format";
+public interface StringConstants{
+    String FAILED_RETRIVE_MEDIA_DATA = "Failed to retrieve media data";
+    String INVALID_INBOX_FORMAT = "Invalid inbox message format";
+
+    String MEDIA_URL = "mediaUrl";
+    String MEDIA_TYPE = "mediaType";
+    String MEDIA_THUMBNAIL = "mediaThumbnail";
+    String MEDIA_DATA = "mediaData";
 }