@adobe/react-native-aepmessaging 6.0.4 → 6.0.5

package/android/src/main/java/com/adobe/marketing/mobile/reactnative/messaging/RCTAEPMessagingModule.java

@@ -11,6 +11,8 @@
  */
 package com.adobe.marketing.mobile.reactnative.messaging;
 
+import static com.adobe.marketing.mobile.reactnative.messaging.RCTAEPMessagingUtil.convertMessageToMap;
+
 import android.app.Activity;
 
 import androidx.annotation.NonNull;
@@ -84,7 +86,11 @@ public final class RCTAEPMessagingModule
 
   @ReactMethod
   public void getLatestMessage(final Promise promise) {
-    promise.resolve(this.latestMessage);
+    if (this.latestMessage != null) {
+      promise.resolve(RCTAEPMessagingUtil.convertToReadableMap(convertMessageToMap(this.latestMessage)));
+    } else {
+      promise.resolve(null);
+    }
   }
 
   @ReactMethod
@@ -174,7 +180,7 @@ public final class RCTAEPMessagingModule
     Message message = MessagingUtils.getMessageForPresentable((Presentable<InAppMessage>) presentable);
     if (message != null) {
       Map<String, String> data =
-          RCTAEPMessagingUtil.convertMessageToMap(message);
+          convertMessageToMap(message);
       emitEvent("onShow", data);
     }
   }
@@ -185,7 +191,7 @@ public final class RCTAEPMessagingModule
     Message message = MessagingUtils.getMessageForPresentable((Presentable<InAppMessage>) presentable);
     if (message != null) {
       Map<String, String> data =
-          RCTAEPMessagingUtil.convertMessageToMap(message);
+          convertMessageToMap(message);
       emitEvent("onDismiss", data);
     }
   }
@@ -196,7 +202,7 @@ public final class RCTAEPMessagingModule
     Message message = MessagingUtils.getMessageForPresentable((Presentable<InAppMessage>) presentable);
     if (message != null) {
       Map<String, String> data =
-              RCTAEPMessagingUtil.convertMessageToMap(message);
+              convertMessageToMap(message);
       emitEvent("onHide", data);
     }
   }
@@ -207,7 +213,7 @@ public final class RCTAEPMessagingModule
     Message message = MessagingUtils.getMessageForPresentable((Presentable<InAppMessage>) presentable);
     if (message != null) {
       Map<String, String> data =
-          RCTAEPMessagingUtil.convertMessageToMap(message);
+          convertMessageToMap(message);
       emitEvent("shouldShowMessage", data);
       // Latch stops the thread until the shouldShowMessage value is received
       // from the JS side on thread dedicated to run JS code. The function
@@ -234,7 +240,7 @@ public final class RCTAEPMessagingModule
     Message message = MessagingUtils.getMessageForPresentable((Presentable<InAppMessage>) presentable);
     if (message != null) {
       Map<String, String> data =
-              RCTAEPMessagingUtil.convertMessageToMap(message);
+              convertMessageToMap(message);
       emitEvent("onContentLoaded", data);
     }
   }
@@ -263,4 +269,4 @@ public final class RCTAEPMessagingModule
         .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
         .emit(name, eventData);
   }
-}
+}

package/android/src/main/java/com/adobe/marketing/mobile/reactnative/messaging/RCTAEPMessagingUtil.java

@@ -10,205 +10,210 @@
     language governing permissions and limitations under the License.
  */
 
-package com.adobe.marketing.mobile.reactnative.messaging;
-
-import android.app.Activity;
-import com.adobe.marketing.mobile.Message;
-import com.adobe.marketing.mobile.MessagingEdgeEventType;
-import com.adobe.marketing.mobile.messaging.Proposition;
-import com.adobe.marketing.mobile.messaging.PropositionItem;
-import com.adobe.marketing.mobile.messaging.Surface;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeArray;
-import com.facebook.react.bridge.WritableNativeMap;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-/**
- * Utility class for converting data models to {@link
- * com.facebook.react.bridge.WritableMap}
- */
-
-class RCTAEPMessagingUtil {
-
-  private static final String TAG = "RCTAEPMessaging";
-
-  private RCTAEPMessagingUtil() {}
-
-  // From React Native
-  static MessagingEdgeEventType getEventType(final int eventType) {
-    switch (eventType) {
-    case 0:
-      return MessagingEdgeEventType.DISMISS;
-    case 1:
-      return MessagingEdgeEventType.INTERACT;
-    case 2:
-      return MessagingEdgeEventType.TRIGGER;
-    case 3:
-      return MessagingEdgeEventType.DISPLAY;
-    case 4:
-      return MessagingEdgeEventType.PUSH_APPLICATION_OPENED;
-    case 5:
-      return MessagingEdgeEventType.PUSH_CUSTOM_ACTION;
-    default:
-      return null;
-    }
-  }
-
-  static List<Surface> convertSurfaces(final ReadableArray rawSurfaces) {
-    List<Surface> surfaces = new ArrayList<>();
-
-    for (int i = 0; i < rawSurfaces.size(); i++) {
-      surfaces.add(new Surface(rawSurfaces.getString(i)));
-    }
-
-    return surfaces;
-  }
-
-  // To React Native
-  static WritableMap toWritableMap(Map<String, Object> map) {
-    if (map == null) {
-      return null;
-    }
-
-    WritableMap writableMap = Arguments.createMap();
-    Iterator iterator = map.entrySet().iterator();
-
-    while (iterator.hasNext()) {
-      Map.Entry pair = (Map.Entry)iterator.next();
-      Object value = pair.getValue();
-
-      if (value == null) {
-        writableMap.putNull((String)pair.getKey());
-      } else if (value instanceof Boolean) {
-        writableMap.putBoolean((String)pair.getKey(), (Boolean)value);
-      } else if (value instanceof Double) {
-        writableMap.putDouble((String)pair.getKey(), (Double)value);
-      } else if (value instanceof Integer) {
-        writableMap.putInt((String)pair.getKey(), (Integer)value);
-      } else if (value instanceof String) {
-        writableMap.putString((String)pair.getKey(), (String)value);
-      } else if (value instanceof Map) {
-        writableMap.putMap((String)pair.getKey(),
-                           toWritableMap((Map<String, Object>)value));
-      } else if (value instanceof List) {
-        writableMap.putArray((String)pair.getKey(),
-                             toWritableArray((List)value));
-      } else if (value.getClass() != null && value.getClass().isArray()) {
-        writableMap.putArray((String)pair.getKey(),
-                             toWritableArray((Object[])value));
-      }
-    }
-
-    return writableMap;
-  }
-
-  static WritableArray toWritableArray(Object[] array) {
-    if (array == null) {
-      return null;
-    }
-    WritableArray writableArr = Arguments.createArray();
-
-    for (int i = 0; i < array.length; i++) {
-      Object value = array[i];
-
-      if (value == null) {
-        writableArr.pushNull();
-      } else if (value instanceof Boolean) {
-        writableArr.pushBoolean((Boolean)value);
-      } else if (value instanceof Double) {
-        writableArr.pushDouble((Double)value);
-      } else if (value instanceof Integer) {
-        writableArr.pushInt((Integer)value);
-      } else if (value instanceof String) {
-        writableArr.pushString((String)value);
-      } else if (value instanceof Map) {
-        writableArr.pushMap(toWritableMap((Map<String, Object>)value));
-      } else if (value instanceof List) {
-        writableArr.pushArray(toWritableArray((List)value));
-      } else if (value.getClass().isArray()) {
-        writableArr.pushArray(toWritableArray((Object[])value));
-      }
-    }
-
-    return writableArr;
-  }
-
-  static WritableArray toWritableArray(List array) {
-    if (array == null) {
-      return null;
-    }
-    WritableArray writableArr = Arguments.createArray();
-
-    for (Object value : array) {
-      if (value == null) {
-        writableArr.pushNull();
-      } else if (value instanceof Boolean) {
-        writableArr.pushBoolean((Boolean)value);
-      } else if (value instanceof Double) {
-        writableArr.pushDouble((Double)value);
-      } else if (value instanceof Integer) {
-        writableArr.pushInt((Integer)value);
-      } else if (value instanceof String) {
-        writableArr.pushString((String)value);
-      } else if (value instanceof Map) {
-        writableArr.pushMap(toWritableMap((Map<String, Object>)value));
-      } else if (value instanceof List) {
-        writableArr.pushArray(toWritableArray((List)value));
-      } else if (value.getClass().isArray()) {
-        writableArr.pushArray(toWritableArray((Object[])value));
-      }
-    }
-
-    return writableArr;
-  }
-
-  static Map convertMessageToMap(final Message message) {
-    Map data = new HashMap<>();
-    data.put("id", message.getId());
-    data.put("autoTrack", message.getAutoTrack());
-    return data;
-  }
-
-  static ReadableArray convertMessagesToJS(final Collection<Message> messages) {
-    WritableArray result = new WritableNativeArray();
-
-    for (Iterator<Message> iterator = messages.iterator();
-         iterator.hasNext();) {
-      result.pushMap((ReadableMap)convertMessageToMap(iterator.next()));
-    }
-
-    return result;
-  }
-
-  static WritableMap convertSurfacePropositions(
-      final Map<Surface, List<Proposition>> propositionMap,
-      String packageName) {
-    WritableMap data = new WritableNativeMap();
-
-    for (Map.Entry<Surface, List<Proposition>> entry :
-         propositionMap.entrySet()) {
-      String key = entry.getKey().getUri().replace(
-          "mobileapp://" + packageName + "/", "");
-      WritableArray propositions = new WritableNativeArray();
-
-      for (Iterator<Proposition> iterator = entry.getValue().iterator();
-           iterator.hasNext();) {
-        propositions.pushMap(toWritableMap(iterator.next().toEventData()));
-      }
-
-      data.putArray(key, propositions);
-    }
-
-    return data;
-  }
-}
+ package com.adobe.marketing.mobile.reactnative.messaging;
+
+ import com.adobe.marketing.mobile.Message;
+ import com.adobe.marketing.mobile.MessagingEdgeEventType;
+ import com.adobe.marketing.mobile.messaging.Proposition;
+ import com.adobe.marketing.mobile.messaging.Surface;
+ import com.facebook.react.bridge.Arguments;
+ import com.facebook.react.bridge.ReadableArray;
+ import com.facebook.react.bridge.ReadableMap;
+ import com.facebook.react.bridge.WritableArray;
+ import com.facebook.react.bridge.WritableMap;
+ import com.facebook.react.bridge.WritableNativeArray;
+ import com.facebook.react.bridge.WritableNativeMap;
+ import java.util.ArrayList;
+ import java.util.Collection;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+ 
+ /**
+  * Utility class for converting data models to {@link
+  * com.facebook.react.bridge.WritableMap}
+  */
+ 
+ class RCTAEPMessagingUtil {
+ 
+   private static final String TAG = "RCTAEPMessaging";
+ 
+   private RCTAEPMessagingUtil() {}
+ 
+   // From React Native
+   static MessagingEdgeEventType getEventType(final int eventType) {
+     switch (eventType) {
+     case 0:
+       return MessagingEdgeEventType.DISMISS;
+     case 1:
+       return MessagingEdgeEventType.INTERACT;
+     case 2:
+       return MessagingEdgeEventType.TRIGGER;
+     case 3:
+       return MessagingEdgeEventType.DISPLAY;
+     case 4:
+       return MessagingEdgeEventType.PUSH_APPLICATION_OPENED;
+     case 5:
+       return MessagingEdgeEventType.PUSH_CUSTOM_ACTION;
+     default:
+       return null;
+     }
+   }
+ 
+   static List<Surface> convertSurfaces(final ReadableArray rawSurfaces) {
+     List<Surface> surfaces = new ArrayList<>();
+ 
+     for (int i = 0; i < rawSurfaces.size(); i++) {
+       surfaces.add(new Surface(rawSurfaces.getString(i)));
+     }
+ 
+     return surfaces;
+   }
+ 
+   // To React Native
+   static WritableMap toWritableMap(Map<String, Object> map) {
+     if (map == null) {
+       return null;
+     }
+ 
+     WritableMap writableMap = Arguments.createMap();
+     Iterator iterator = map.entrySet().iterator();
+ 
+     while (iterator.hasNext()) {
+       Map.Entry pair = (Map.Entry)iterator.next();
+       Object value = pair.getValue();
+ 
+       if (value == null) {
+         writableMap.putNull((String)pair.getKey());
+       } else if (value instanceof Boolean) {
+         writableMap.putBoolean((String)pair.getKey(), (Boolean)value);
+       } else if (value instanceof Double) {
+         writableMap.putDouble((String)pair.getKey(), (Double)value);
+       } else if (value instanceof Integer) {
+         writableMap.putInt((String)pair.getKey(), (Integer)value);
+       } else if (value instanceof String) {
+         writableMap.putString((String)pair.getKey(), (String)value);
+       } else if (value instanceof Map) {
+         writableMap.putMap((String)pair.getKey(),
+                            toWritableMap((Map<String, Object>)value));
+       } else if (value instanceof List) {
+         writableMap.putArray((String)pair.getKey(),
+                              toWritableArray((List)value));
+       } else if (value.getClass() != null && value.getClass().isArray()) {
+         writableMap.putArray((String)pair.getKey(),
+                              toWritableArray((Object[])value));
+       }
+     }
+ 
+     return writableMap;
+   }
+ 
+   static WritableArray toWritableArray(Object[] array) {
+     if (array == null) {
+       return null;
+     }
+     WritableArray writableArr = Arguments.createArray();
+ 
+     for (int i = 0; i < array.length; i++) {
+       Object value = array[i];
+ 
+       if (value == null) {
+         writableArr.pushNull();
+       } else if (value instanceof Boolean) {
+         writableArr.pushBoolean((Boolean)value);
+       } else if (value instanceof Double) {
+         writableArr.pushDouble((Double)value);
+       } else if (value instanceof Integer) {
+         writableArr.pushInt((Integer)value);
+       } else if (value instanceof String) {
+         writableArr.pushString((String)value);
+       } else if (value instanceof Map) {
+         writableArr.pushMap(toWritableMap((Map<String, Object>)value));
+       } else if (value instanceof List) {
+         writableArr.pushArray(toWritableArray((List)value));
+       } else if (value.getClass().isArray()) {
+         writableArr.pushArray(toWritableArray((Object[])value));
+       }
+     }
+ 
+     return writableArr;
+   }
+ 
+   static WritableArray toWritableArray(List array) {
+     if (array == null) {
+       return null;
+     }
+     WritableArray writableArr = Arguments.createArray();
+ 
+     for (Object value : array) {
+       if (value == null) {
+         writableArr.pushNull();
+       } else if (value instanceof Boolean) {
+         writableArr.pushBoolean((Boolean)value);
+       } else if (value instanceof Double) {
+         writableArr.pushDouble((Double)value);
+       } else if (value instanceof Integer) {
+         writableArr.pushInt((Integer)value);
+       } else if (value instanceof String) {
+         writableArr.pushString((String)value);
+       } else if (value instanceof Map) {
+         writableArr.pushMap(toWritableMap((Map<String, Object>)value));
+       } else if (value instanceof List) {
+         writableArr.pushArray(toWritableArray((List)value));
+       } else if (value.getClass().isArray()) {
+         writableArr.pushArray(toWritableArray((Object[])value));
+       }
+     }
+ 
+     return writableArr;
+   }
+ 
+   static Map<String, String> convertMessageToMap(final Message message) {
+     Map<String, String> data = new HashMap<>();
+     data.put("id", message.getId());
+     data.put("autoTrack", String.valueOf(message.getAutoTrack()));
+     return data;
+   }
+ 
+   static ReadableArray convertMessagesToJS(final Collection<Message> messages) {
+     WritableArray result = new WritableNativeArray();
+ 
+       for (Message message : messages) {
+           result.pushMap(convertToReadableMap(convertMessageToMap(message)));
+       }
+ 
+     return result;
+   }
+ 
+   static WritableMap convertSurfacePropositions(
+       final Map<Surface, List<Proposition>> propositionMap,
+       String packageName) {
+     WritableMap data = new WritableNativeMap();
+ 
+     for (Map.Entry<Surface, List<Proposition>> entry :
+          propositionMap.entrySet()) {
+       String key = entry.getKey().getUri().replace(
+           "mobileapp://" + packageName + "/", "");
+       WritableArray propositions = new WritableNativeArray();
+ 
+       for (Iterator<Proposition> iterator = entry.getValue().iterator();
+            iterator.hasNext();) {
+         propositions.pushMap(toWritableMap(iterator.next().toEventData()));
+       }
+ 
+       data.putArray(key, propositions);
+     }
+ 
+     return data;
+   }
+ 
+   static ReadableMap convertToReadableMap(Map<String, String> map) {
+     WritableMap writableMap = Arguments.createMap();
+ 
+     for (Map.Entry<String, String> entry : map.entrySet()) {
+       writableMap.putString(entry.getKey(), entry.getValue());
+     }
+     return writableMap;
+   }
+ }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/react-native-aepmessaging",
-  "version": "6.0.4",
+  "version": "6.0.5",
   "description": "Adobe Experience Platform support for React Native apps.",
   "homepage": "https://developer.adobe.com/client-sdks/documentation/",
   "license": "Apache-2.0",
@@ -39,5 +39,5 @@
   "installConfig": {
     "hoistingLimits": "dependencies"
   },
-  "gitHead": "129d28814e8a2f46e59554ce976bd06d5b25aaea"
+  "gitHead": "d907afaf1a8d7521a95ab744bf0e7ea6890e79db"
 }