diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-27 09:42:05 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-27 09:42:05 +0200 |
| commit | 44676ede5ba7df73fc4f7586fea010db55b80d4d (patch) | |
| tree | 2e0849ec6951fc2b6d12b97f2876c17b1b09245b | |
| parent | 36f2fad7e34ab4a87f371278e5416ff5cea00971 (diff) | |
| parent | eda60b21c9190a3857655a044f8e81bd29189eef (diff) | |
| download | mullvadvpn-44676ede5ba7df73fc4f7586fea010db55b80d4d.tar.xz mullvadvpn-44676ede5ba7df73fc4f7586fea010db55b80d4d.zip | |
Merge branch 'expose-ownership-and-provider-for-relays-droid-464'
3 files changed, 17 insertions, 10 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt index 411d540f65..bfbee80f9e 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt @@ -156,15 +156,19 @@ class SelectLocationScreenTest { companion object { private val DUMMY_RELAY_1 = net.mullvad.mullvadvpn.model.Relay( - "Relay host 1", - true, - RelayEndpointData.Wireguard(WireguardRelayEndpointData) + hostname = "Relay host 1", + active = true, + endpointData = RelayEndpointData.Wireguard(WireguardRelayEndpointData), + owned = true, + provider = "PROVIDER" ) private val DUMMY_RELAY_2 = net.mullvad.mullvadvpn.model.Relay( - "Relay host 2", - true, - RelayEndpointData.Wireguard(WireguardRelayEndpointData) + hostname = "Relay host 2", + active = true, + endpointData = RelayEndpointData.Wireguard(WireguardRelayEndpointData), + owned = true, + provider = "PROVIDER" ) private val DUMMY_RELAY_CITY_1 = RelayListCity("Relay City 1", "RCi1", arrayListOf(DUMMY_RELAY_1)) diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt index b1abdc3c75..461648209c 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt @@ -4,8 +4,13 @@ import android.os.Parcelable import kotlinx.parcelize.Parcelize @Parcelize -data class Relay(val hostname: String, val active: Boolean, val endpointData: RelayEndpointData) : - Parcelable { +data class Relay( + val hostname: String, + val active: Boolean, + val owned: Boolean, + val provider: String, + val endpointData: RelayEndpointData +) : Parcelable { val isWireguardRelay get() = endpointData is RelayEndpointData.Wireguard } diff --git a/mullvad-types/src/relay_list.rs b/mullvad-types/src/relay_list.rs index 3364f383a5..4b1c8df346 100644 --- a/mullvad-types/src/relay_list.rs +++ b/mullvad-types/src/relay_list.rs @@ -81,9 +81,7 @@ pub struct Relay { #[cfg_attr(target_os = "android", jnix(skip))] pub include_in_country: bool, pub active: bool, - #[cfg_attr(target_os = "android", jnix(skip))] pub owned: bool, - #[cfg_attr(target_os = "android", jnix(skip))] pub provider: String, #[cfg_attr(target_os = "android", jnix(skip))] pub weight: u64, |