diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-03 16:22:10 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-03 16:22:10 +0200 |
| commit | 6755586be823effd7128420b0cf5cfe9b5bf3a61 (patch) | |
| tree | f7d1301e490f886499b230aef9d1aa5aa17c5cee /android/lib/ui | |
| parent | 82ef8c8fb924351172d2baf93b77023e6a408a90 (diff) | |
| parent | 675394de27138e98c8b171737114779834f7189d (diff) | |
| download | mullvadvpn-6755586be823effd7128420b0cf5cfe9b5bf3a61.tar.xz mullvadvpn-6755586be823effd7128420b0cf5cfe9b5bf3a61.zip | |
Merge branch 'bypass-quic-socket-android'
Diffstat (limited to 'android/lib/ui')
2 files changed, 5 insertions, 1 deletions
diff --git a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/RelayItemPreviewData.kt b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/RelayItemPreviewData.kt index 724c567595..2e4e228439 100644 --- a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/RelayItemPreviewData.kt +++ b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/relaylist/RelayItemPreviewData.kt @@ -51,7 +51,7 @@ private fun generateRelayItemRelay( provider = ProviderId("Provider"), ownership = Ownership.MullvadOwned, daita = daita, - quic = false, + quic = null, ) private fun String.generateCountryCode() = diff --git a/android/lib/ui/tag/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/tag/TestTagConstants.kt b/android/lib/ui/tag/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/tag/TestTagConstants.kt index ba022e0edc..9b7be4dc07 100644 --- a/android/lib/ui/tag/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/tag/TestTagConstants.kt +++ b/android/lib/ui/tag/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/tag/TestTagConstants.kt @@ -32,11 +32,15 @@ const val WIREGUARD_OBFUSCATION_SHADOWSOCKS_CELL_TEST_TAG = "wireguard_obfuscation_shadowsocks_cell_test_tag" const val WIREGUARD_OBFUSCATION_UDP_OVER_TCP_CELL_TEST_TAG = "wireguard_obfuscation_udp_over_tcp_cell_test_tag" + +const val WIREGUARD_OBFUSCATION_QUIC_CELL_TEST_TAG = "wireguard_obfuscation_quic_cell_test_tag" // Account screen const val MANAGE_DEVICES_BUTTON_TEST_TAG = "manage_devices_button_test_tag" // SelectLocationScreen, ConnectScreen, CustomListLocationsScreen const val SELECT_LOCATION_SCREEN_TEST_TAG = "select_location_screen_test_tag" + +const val SELECT_LOCATION_LIST_TEST_TAG = "select_location_list_test_tag" const val CIRCULAR_PROGRESS_INDICATOR_TEST_TAG = "circular_progress_indicator_test_tag" const val EXPAND_BUTTON_TEST_TAG = "expand_button_test_tag" const val LOCATION_CELL_TEST_TAG = "location_cell_test_tag" |