Merge pull request #2852 from pingwang2011/timob-2729

timob-2729: Android: runtime errors and intermittent crash when removing values from picker
tidev · Aug 31, 2012 · b61af32 · b61af32
2 parents 6323dc4 + 2ea3b82
commit b61af32
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/PickerColumnProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/PickerColumnProxy.java
@@ -144,9 +144,13 @@ private void handleRemoveRow(TiViewProxy o)
 	}
 
 	@Kroll.method
-	public void addRow(PickerRowProxy row)
+	public void addRow(Object row)
 	{
-		this.add(row);
+		if (row instanceof PickerRowProxy) {
+			this.add((PickerRowProxy) row);
+		} else {
+			Log.w(TAG, "Unable to add the row. Invalid type for row.");
+		}
 	}
 
 	protected void addRows(Object[] rows) 
@@ -161,9 +165,13 @@ protected void addRows(Object[] rows)
 	}
 
 	@Kroll.method
-	public void removeRow(PickerRowProxy row) 
+	public void removeRow(Object row)
 	{
-		this.remove(row);
+		if (row instanceof PickerRowProxy) {
+			this.remove((PickerRowProxy) row);
+		} else {
+			Log.w(TAG, "Unable to remove the row. Invalid type for row.");
+		}
 	}
 
 	@Kroll.getProperty @Kroll.method