[TIMOB-24817] Fix combining of properties

tidev · Apr 30, 2018 · 4bfcb41 · 4bfcb41
1 parent e2635c7
commit 4bfcb41
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListViewTemplate.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListViewTemplate.java
@@ -138,7 +138,7 @@ private DataItem bindProxiesAndProperties(KrollDict properties, boolean isRootTe
 	{
 		Object proxy = null;
 		String id = null;
-		Object props = null;
+		KrollDict props = null;
 		DataItem item = null;
 		if (properties.containsKey(TiC.PROPERTY_TI_PROXY)) {
 			proxy = properties.get(TiC.PROPERTY_TI_PROXY);
@@ -167,11 +167,17 @@ private DataItem bindProxiesAndProperties(KrollDict properties, boolean isRootTe
 		}
 
 		if (properties.containsKey(TiC.PROPERTY_PROPERTIES)) {
-			props = properties.get(TiC.PROPERTY_PROPERTIES);
+			KrollDict templateProperties = properties.getKrollDict(TiC.PROPERTY_PROPERTIES);
+			if (templateProperties != null) {
+				if (props != null) {
+					props.putAll(templateProperties);
+				} else {
+					props = templateProperties;
+				}
+			}
 		}
-
-		if (props instanceof HashMap) {
-			item.setDefaultProperties(new KrollDict((HashMap) props));
+		if (props != null) {
+			item.setDefaultProperties(props);
 		}
 
 		return item;