fix: [ANDROAPP-6984] crash when clearing radio button input (#4125)

* fix: [ANDROAPP-6984] crash when clearing radio button input

Signed-off-by: Manu Muñoz <[email protected]>

* fix: [ANDROAPP-6984] correct flaky tests

---------

Signed-off-by: Manu Muñoz <[email protected]>
Co-authored-by: Xavier Molloy <[email protected]>

Author: mmmateos

app/src/androidTest/java/org/dhis2/usescases/datasets/DataSetInitialRobot.kt

@@ -20,7 +20,6 @@ internal class DataSetInitialRobot : BaseRobot() {
     }
 
     fun clickOnInputPeriod() {
-        waitForView(withId(R.id.dataSetPeriodInputLayout), 5000)
         onView(withId(R.id.dataSetPeriodInputLayout)).perform(click())
     }
 

app/src/androidTest/java/org/dhis2/usescases/datasets/DataSetTableRobot.kt

@@ -274,12 +274,8 @@ internal class DataSetTableRobot(
         )
     }
 
-    @OptIn(ExperimentalTestApi::class)
     fun tapOnSaveButton() {
-        composeTestRule.waitUntilExactlyOneExists(
-            hasTestTag(SAVE_BUTTON_TAG),
-            timeoutMillis = 3000
-        )
+        composeTestRule.waitForIdle()
         composeTestRule.onNodeWithTag(SAVE_BUTTON_TAG).performClick()
         composeTestRule.waitForIdle()
     }

app/src/main/java/org/dhis2/usescases/datasets/datasetInitial/DataSetInitialActivity.java

@@ -18,7 +18,6 @@
 import org.dhis2.commons.Constants;
 import org.dhis2.commons.extensions.CategoryOptionExtensionsKt;
 import org.dhis2.commons.featureconfig.data.FeatureConfigRepository;
-import org.dhis2.commons.featureconfig.model.Feature;
 import org.dhis2.commons.orgunitselector.OUTreeFragment;
 import org.dhis2.commons.orgunitselector.OrgUnitSelectorScope;
 import org.dhis2.commons.resources.DhisPeriodUtils;

app/src/main/java/org/dhis2/usescases/datasets/datasetInitial/DataSetInitialPresenter.kt

@@ -7,6 +7,7 @@ import org.dhis2.commons.data.tuples.Pair
 import org.dhis2.commons.extensions.inDateRange
 import org.dhis2.commons.extensions.inOrgUnit
 import org.dhis2.commons.schedulers.SchedulerProvider
+import org.dhis2.mobile.commons.coroutine.CoroutineTracker
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.period.PeriodType
@@ -65,6 +66,7 @@ class DataSetInitialPresenter(
     }
 
     override fun onCatOptionClick(catOptionUid: String) {
+        CoroutineTracker.increment()
         compositeDisposable.add(
             dataSetInitialRepository.catCombo(catOptionUid)
                 .subscribeOn(schedulerProvider.io())
@@ -79,6 +81,7 @@ class DataSetInitialPresenter(
                                     it.inOrgUnit(view.selectedOrgUnit?.uid())
                             },
                         )
+                        CoroutineTracker.decrement()
                     },
                     Timber::d,
                 ),

commons/src/main/java/org/dhis2/commons/orgunitselector/OUTreeFragment.kt

@@ -22,6 +22,7 @@ import kotlinx.coroutines.launch
 import org.dhis2.commons.R
 import org.dhis2.commons.dialogs.bottomsheet.bottomSheetInsets
 import org.dhis2.commons.dialogs.bottomsheet.bottomSheetLowerPadding
+import org.dhis2.mobile.commons.coroutine.CoroutineTracker
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.mobile.ui.designsystem.component.OrgBottomSheet
 import javax.inject.Inject
@@ -71,6 +72,7 @@ class OUTreeFragment : BottomSheetDialogFragment() {
         }
 
         fun build(): OUTreeFragment {
+            CoroutineTracker.increment()
             return OUTreeFragment().apply {
                 selectionCallback = selectionListener
                 model = ouTreeModel
@@ -79,6 +81,7 @@ class OUTreeFragment : BottomSheetDialogFragment() {
                     putParcelable(ARG_SCOPE, orgUnitScope)
                     putStringArrayList(ARG_PRE_SELECTED_OU, ArrayList(preselectedOrgUnits))
                 }
+                CoroutineTracker.decrement()
             }
         }
     }

form/src/main/java/org/dhis2/form/ui/provider/inputfield/RadioButtonProvider.kt

@@ -53,14 +53,18 @@ internal fun ProvideRadioButtonInput(
         isRequired = fieldUiModel.mandatory,
         itemSelected = data.find { it.selected },
         onItemChange = { item ->
-            val selectedIndex = data.indexOf(item)
-            intentHandler(
-                FormIntent.OnSave(
-                    fieldUiModel.uid,
-                    codeList[selectedIndex],
-                    fieldUiModel.valueType,
-                ),
-            )
+            if (item != null) {
+                val selectedIndex = data.indexOf(item)
+                intentHandler(
+                    FormIntent.OnSave(
+                        fieldUiModel.uid,
+                        codeList[selectedIndex],
+                        fieldUiModel.valueType,
+                    ),
+                )
+            } else {
+                intentHandler(FormIntent.ClearValue(fieldUiModel.uid))
+            }
         },
     )
 }