fix(android): improve selection validation (#12682)

Fixes TIMOB-28410
tidev · Apr 6, 2021 · 42ac86b · 42ac86b
1 parent 92603cd
commit 42ac86b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
@@ -156,7 +156,10 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
 				@Override
 				public Object getKey(int position)
 				{
-					return items.get(position);
+					if (position > -1 && position < items.size()) {
+						return items.get(position);
+					}
+					return null;
 				}
 
 				@Override
@@ -186,7 +189,12 @@ public int getPosition()
 							@Override
 							public Object getSelectionKey()
 							{
-								return items.get(getPosition());
+								final int position = getPosition();
+
+								if (position > -1 && position < items.size()) {
+									return items.get(position);
+								}
+								return null;
 							}
 						};
 					}

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TiTableView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TiTableView.java
@@ -162,7 +162,10 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
 				@Override
 				public Object getKey(int position)
 				{
-					return rows.get(position);
+					if (position > -1 && position < rows.size()) {
+						return rows.get(position);
+					}
+					return null;
 				}
 
 				@Override
@@ -192,7 +195,12 @@ public int getPosition()
 							@Override
 							public Object getSelectionKey()
 							{
-								return rows.get(getPosition());
+								final int position = getPosition();
+
+								if (position > -1 && position < rows.size()) {
+									return rows.get(position);
+								}
+								return null;
 							}
 						};
 					}