Fix crash when focusing remove button in device list screen

mullvad · Aug 12, 2024 · 29db209 · 29db209
1 parent 364772f
commit 29db209
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt
@@ -73,7 +73,15 @@ internal fun BaseCell(
         horizontalArrangement = Arrangement.Start,
         modifier =
             modifier
-                .clickable(isRowEnabled, onClick = onCellClicked)
+                // This is to avoid a crash when a child view is focused and clickable is set to
+                // false on the parent view
+                .then(
+                    if (isRowEnabled) {
+                        Modifier.clickable(onClick = onCellClicked)
+                    } else {
+                        Modifier
+                    }
+                )
                 .wrapContentHeight()
                 .defaultMinSize(minHeight = minHeight)
                 .fillMaxWidth()