diff options
Diffstat (limited to 'android/lib/model')
3 files changed, 7 insertions, 5 deletions
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Provider.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Provider.kt deleted file mode 100644 index e704e9554d..0000000000 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Provider.kt +++ /dev/null @@ -1,3 +0,0 @@ -package net.mullvad.mullvadvpn.lib.model - -data class Provider(val providerId: ProviderId, val ownership: Ownership) diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ProviderId.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ProviderId.kt index cc23c3e9b6..1682e2018d 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ProviderId.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ProviderId.kt @@ -1,3 +1,7 @@ package net.mullvad.mullvadvpn.lib.model -@JvmInline value class ProviderId(val value: String) +@JvmInline +value class ProviderId(val value: String) : Comparable<ProviderId> { + override fun compareTo(other: ProviderId): Int = + value.uppercase().compareTo(other.value.uppercase()) +} diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayItem.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayItem.kt index af96c4d94d..3ff0788776 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayItem.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayItem.kt @@ -56,7 +56,8 @@ sealed interface RelayItem { @optics data class Relay( override val id: GeoLocationId.Hostname, - val provider: Provider, + val provider: ProviderId, + val ownership: Ownership, override val active: Boolean, val daita: Boolean, ) : Location { |