diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-07-17 16:05:52 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-07-17 16:05:52 +0200 |
| commit | d97c660791078e3f4efbc4ef5921ed4d4a978ae5 (patch) | |
| tree | 69c9e97ae7e727f7e51369ebfabc0f2e4388aa1b /android | |
| parent | 288d9f009f949d370c4c5c3fdae6622bbc39b1d1 (diff) | |
| parent | fdb19d8e59a669c94732ff9cee455b679c29a61d (diff) | |
| download | mullvadvpn-d97c660791078e3f4efbc4ef5921ed4d4a978ae5.tar.xz mullvadvpn-d97c660791078e3f4efbc4ef5921ed4d4a978ae5.zip | |
Merge branch 'make-entryexit-relay-non-selectable-in-select-location-droid-2079'
Diffstat (limited to 'android')
| -rw-r--r-- | android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/SelectableRelayListItem.kt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/SelectableRelayListItem.kt b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/SelectableRelayListItem.kt index ca70bf8a90..83b24ff137 100644 --- a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/SelectableRelayListItem.kt +++ b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/SelectableRelayListItem.kt @@ -105,7 +105,10 @@ fun SelectableRelayListItem( ) } }, - onClick = onClick, + onClick = + if (relayListItem.state == null) onClick + /* Workaround for not allowing to select relay that is currently used as entry or exit */ + else ({}), onLongClick = onLongClick, trailingContent = if (relayListItem.item.hasChildren) { |