From 601427f8c2e46396a3982f4d6f2bfe11e7059904 Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 30 May 2019 11:10:30 +0200 Subject: [PATCH] Code cleanup --- .../android/ui/fragment/DataListFragment.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt index f4ecb721..7f3cb6fa 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt @@ -78,8 +78,13 @@ class DataListFragment : DeletableItemFragment(), LiveRowRepresentableDataSource dataListAdapter = RowRepresentableAdapter(this, this) val swipeToDelete = SwipeToDeleteCallback(dataListAdapter) { position -> - val itemId = (this.items[position] as Identifiable).id - deleteItem(dataListAdapter, items, itemId) + val item = this.items[position] + if (item != null) { + val itemId = item.id + deleteItem(dataListAdapter, items, itemId) + } else { + throw IllegalStateException("Item with position $position not found") + } } val itemTouchHelper = ItemTouchHelper(swipeToDelete)