Skip to content

Add List Array check for Writeable Map in Utils files #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 8, 2022
Merged

Add List Array check for Writeable Map in Utils files #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
237a47c
Add List Array check for Writeable Map in Utils files
cacheung Mar 3, 2022
8c22421
Merge branch 'staging' of github.com:adobe/aepsdk-react-native into List
cacheung Mar 7, 2022
4ba4660
Remove unused writeableMap for EdgeIdentity
cacheung Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions ...es/core/android/src/main/java/com/adobe/marketing/mobile/reactnative/RCTAEPArrayUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.facebook.react.bridge.ReadableType;
import com.facebook.react.bridge.WritableArray;

import java.util.List;
import java.util.Map;

class RCTAEPArrayUtil {
Expand Down Expand Up @@ -76,6 +77,8 @@ static WritableArray toWritableArray(Object[] array) {
writableArr.pushString((String) value);
} else if (value instanceof Map) {
writableArr.pushMap(RCTAEPMapUtil.toWritableMap((Map<String, Object>) value));
} else if (value instanceof List) {
writableArr.pushArray(RCTAEPArrayUtil.toWritableArray((List) value));
} else if (value.getClass().isArray()) {
writableArr.pushArray(RCTAEPArrayUtil.toWritableArray((Object[]) value));
}
Expand All @@ -84,4 +87,32 @@ static WritableArray toWritableArray(Object[] array) {
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(RCTAEPMapUtil.toWritableMap((Map<String, Object>) value));
} else if (value instanceof List) {
writableArr.pushArray(RCTAEPArrayUtil.toWritableArray((List) value));
} else if (value.getClass().isArray()) {
writableArr.pushArray(RCTAEPArrayUtil.toWritableArray((Object[]) value));
}
}

return writableArr;
}
}
3 changes: 3 additions & 0 deletions ...ages/core/android/src/main/java/com/adobe/marketing/mobile/reactnative/RCTAEPMapUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

class RCTAEPMapUtil {
Expand Down Expand Up @@ -109,6 +110,8 @@ static WritableMap toWritableMap(Map<String, Object> map) {
writableMap.putString((String) pair.getKey(), (String) value);
} else if (value instanceof Map) {
writableMap.putMap((String) pair.getKey(), RCTAEPMapUtil.toWritableMap((Map<String, Object>) value));
} else if (value instanceof List) {
writableMap.putArray((String) pair.getKey(), RCTAEPArrayUtil.toWritableArray((List) value));
} else if (value.getClass() != null && value.getClass().isArray()) {
writableMap.putArray((String) pair.getKey(), RCTAEPArrayUtil.toWritableArray((Object[]) value));
}
Expand Down
34 changes: 34 additions & 0 deletions .../main/java/com/adobe/marketing/mobile/reactnative/edgeconsent/RCTAEPEdgeConsentUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

class RCTAEPEdgeConsentUtils {
Expand Down Expand Up @@ -87,6 +88,8 @@ static WritableMap toWritableMap(Map<String, Object> map) {
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));
}
Expand Down Expand Up @@ -152,6 +155,37 @@ static WritableArray toWritableArray(Object[] array) {
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;
}

public 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));
}
Expand Down
33 changes: 2 additions & 31 deletions ...java/com/adobe/marketing/mobile/reactnative/edgeidentity/RCTAEPEdgeIdentityArrayUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableType;
import com.facebook.react.bridge.WritableArray;

import java.util.List;
import java.util.Map;

class RCTAEPEdgeIdentityArrayUtil {
Expand Down Expand Up @@ -52,35 +54,4 @@ static Object[] toObjectArray(ReadableArray readableArray) {

return array;
}

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(RCTAEPEdgeIdentityMapUtil.toWritableMap((Map<String, Object>) value));
} else if (value.getClass().isArray()) {
writableArr.pushArray(RCTAEPEdgeIdentityArrayUtil.toWritableArray((Object[]) value));
}
}

return writableArr;
}


}
36 changes: 1 addition & 35 deletions ...n/java/com/adobe/marketing/mobile/reactnative/edgeidentity/RCTAEPEdgeIdentityMapUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

class RCTAEPEdgeIdentityMapUtil {
Expand Down Expand Up @@ -58,39 +59,4 @@ static Map<String, Object> toMap(ReadableMap readableMap) {

return map;
}

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(), RCTAEPEdgeIdentityMapUtil.toWritableMap((Map<String, Object>) value));
} else if (value.getClass() != null && value.getClass().isArray()) {
writableMap.putArray((String) pair.getKey(), RCTAEPEdgeIdentityArrayUtil.toWritableArray((Object[]) value));
}

iterator.remove();
}

return writableMap;
}

}
31 changes: 31 additions & 0 deletions ...n/java/com/adobe/marketing/mobile/reactnative/userprofile/RCTAEPUserProfileArrayUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,37 @@ public static WritableArray toWritableArray(Object[] array) {
writableArr.pushString((String) value);
} else if (value instanceof Map) {
writableArr.pushMap(RCTAEPUserProfileMapUtil.toWritableMap((Map<String, Object>) value));
} else if (value instanceof List) {
writableArr.pushArray(RCTAEPUserProfileArrayUtil.toWritableArray((List) value));
} else if (value.getClass().isArray()) {
writableArr.pushArray(RCTAEPUserProfileArrayUtil.toWritableArray((Object[]) value));
}
}

return writableArr;
}

public 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(RCTAEPUserProfileMapUtil.toWritableMap((Map<String, Object>) value));
} else if (value instanceof List) {
writableArr.pushArray(RCTAEPUserProfileArrayUtil.toWritableArray((List) value));
} else if (value.getClass().isArray()) {
writableArr.pushArray(RCTAEPUserProfileArrayUtil.toWritableArray((Object[]) value));
}
Expand Down
3 changes: 3 additions & 0 deletions ...ain/java/com/adobe/marketing/mobile/reactnative/userprofile/RCTAEPUserProfileMapUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

public class RCTAEPUserProfileMapUtil {
Expand Down Expand Up @@ -109,6 +110,8 @@ public static WritableMap toWritableMap(Map<String, Object> map) {
writableMap.putString((String) pair.getKey(), (String) value);
} else if (value instanceof Map) {
writableMap.putMap((String) pair.getKey(), RCTAEPUserProfileMapUtil.toWritableMap((Map<String, Object>) value));
} else if (value instanceof List) {
writableMap.putArray((String) pair.getKey(), RCTAEPUserProfileArrayUtil.toWritableArray((List) value));
} else if (value.getClass() != null && value.getClass().isArray()) {
writableMap.putArray((String) pair.getKey(), RCTAEPUserProfileArrayUtil.toWritableArray((Object[]) value));
}
Expand Down