diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-08-12 13:14:33 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-12 15:53:00 +0200 |
| commit | 207615f63d7c854f2b2e58f6b35dde678015939f (patch) | |
| tree | 604f227aff3b8244d07207544bc889d1d57f61ad /android/app | |
| parent | 733c212d363f141caa18883ed8c27e3d29c3c974 (diff) | |
| download | mullvadvpn-207615f63d7c854f2b2e58f6b35dde678015939f.tar.xz mullvadvpn-207615f63d7c854f2b2e58f6b35dde678015939f.zip | |
Fix crash when focusing remove button in device list screen
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt | 10 |
1 files changed, 9 insertions, 1 deletions
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 index 19049613bd..ddb0878e45 100644 --- 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() |