diff options
| author | Albin <albin@mullvad.net> | 2024-08-12 15:53:36 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-12 15:53:36 +0200 |
| commit | 34085422afa4e7091b1dae4b5372344a6e9f7d54 (patch) | |
| tree | eac350f7216bd57110dc1f49cb95ec8055badbb0 /android/app/src | |
| parent | 733c212d363f141caa18883ed8c27e3d29c3c974 (diff) | |
| parent | 84933cbd4a3ae57c19ed8292b51a631f2f53ee06 (diff) | |
| download | mullvadvpn-34085422afa4e7091b1dae4b5372344a6e9f7d54.tar.xz mullvadvpn-34085422afa4e7091b1dae4b5372344a6e9f7d54.zip | |
Merge branch 'crash-in-devicelistscreen-on-googletv-droid-1236'
Diffstat (limited to 'android/app/src')
| -rw-r--r-- | android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt | 5 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt index 33e783662e..2a3031ecec 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt @@ -271,10 +271,7 @@ class VpnSettingsScreenTest { ) // Assert - onNodeWithTagAndText( - testTag = String.format(LAZY_LIST_UDP_OVER_TCP_PORT_ITEM_X_TEST_TAG, 5001), - text = "5001" - ) + onNodeWithTag(String.format(LAZY_LIST_UDP_OVER_TCP_PORT_ITEM_X_TEST_TAG, 5001)) .assertExists() .performClick() 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() |