fix: crash when checking multi selection input (#3933)

dhis2 · Dec 18, 2024 · b01db32 · b01db32
1 parent 7dca28c
commit b01db32
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MultiSelectionInputProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MultiSelectionInputProvider.kt
@@ -45,9 +45,13 @@ internal fun ProvideMultiSelectionInput(
         legendData = fieldUiModel.legend(),
         isRequired = fieldUiModel.mandatory,
         onItemsSelected = {
-            val checkedValues = it.filter { item -> item.checked }.map { checkBoxData ->
-                val selectedIndex = data.indexOf(checkBoxData)
-                codeList[selectedIndex]
+            val checkedValues = it.mapNotNull { checkBoxData ->
+                if (checkBoxData.checked) {
+                    val selectedIndex = data.indexOfFirst { originalData -> originalData.uid == checkBoxData.uid }
+                    codeList[selectedIndex]
+                } else {
+                    null
+                }
             }
 
             intentHandler(