diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-01-07 17:26:12 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-16 16:06:00 +0000 |
| commit | 0e40d87c7fd7e5e8998df9a7d3ff7151a47f5afb (patch) | |
| tree | 190ffe06a819cacc4ed935bfa44de4552f2a887c /android/src | |
| parent | 9d3d0aa6982c638b38591b937d3b28b013c9766f (diff) | |
| download | mullvadvpn-0e40d87c7fd7e5e8998df9a7d3ff7151a47f5afb.tar.xz mullvadvpn-0e40d87c7fd7e5e8998df9a7d3ff7151a47f5afb.zip | |
Make `RelayList` parcelable
Diffstat (limited to 'android/src')
6 files changed, 35 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt index e5303f8fc4..23f9d87f77 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt @@ -1,6 +1,14 @@ package net.mullvad.mullvadvpn.model -data class Relay(val hostname: String, val active: Boolean, val tunnels: RelayTunnels) { +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +@Parcelize +data class Relay( + val hostname: String, + val active: Boolean, + val tunnels: RelayTunnels +) : Parcelable { val hasWireguardTunnels get() = !tunnels.wireguard.isEmpty() } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayList.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayList.kt index bc9ec3327a..2373eba536 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayList.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayList.kt @@ -1,5 +1,8 @@ package net.mullvad.mullvadvpn.model +import android.os.Parcelable import java.util.ArrayList +import kotlinx.parcelize.Parcelize -data class RelayList(val countries: ArrayList<RelayListCountry>) +@Parcelize +data class RelayList(val countries: ArrayList<RelayListCountry>) : Parcelable diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCity.kt index 329120350d..d4b3e21f58 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCity.kt @@ -1,5 +1,12 @@ package net.mullvad.mullvadvpn.model +import android.os.Parcelable import java.util.ArrayList +import kotlinx.parcelize.Parcelize -data class RelayListCity(val name: String, val code: String, val relays: ArrayList<Relay>) +@Parcelize +data class RelayListCity( + val name: String, + val code: String, + val relays: ArrayList<Relay> +) : Parcelable diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCountry.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCountry.kt index 035cb52d19..20fdd7de71 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCountry.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCountry.kt @@ -1,9 +1,12 @@ package net.mullvad.mullvadvpn.model +import android.os.Parcelable import java.util.ArrayList +import kotlinx.parcelize.Parcelize +@Parcelize data class RelayListCountry( val name: String, val code: String, val cities: ArrayList<RelayListCity> -) +) : Parcelable diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayTunnels.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayTunnels.kt index 5946620566..5691932888 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayTunnels.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayTunnels.kt @@ -1,5 +1,8 @@ package net.mullvad.mullvadvpn.model +import android.os.Parcelable import java.util.ArrayList +import kotlinx.parcelize.Parcelize -data class RelayTunnels(val wireguard: ArrayList<WireguardEndpointData>) +@Parcelize +data class RelayTunnels(val wireguard: ArrayList<WireguardEndpointData>) : Parcelable diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardEndpointData.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardEndpointData.kt index 1d39f1170d..aee9b56082 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardEndpointData.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardEndpointData.kt @@ -1,3 +1,8 @@ package net.mullvad.mullvadvpn.model -class WireguardEndpointData() +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +@Suppress("PARCELABLE_PRIMARY_CONSTRUCTOR_IS_EMPTY") +@Parcelize +class WireguardEndpointData() : Parcelable |