diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-12-20 07:04:56 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-12-20 14:23:05 +0100 |
| commit | 99bd27986089de8dd05b839d2b8361cae8aefcda (patch) | |
| tree | 1fa7ab88903fe748d1c218cd0bda5bf23d4265b2 /android/lib/model | |
| parent | 92465444d8a51b73fe225461e459449d9ab6e600 (diff) | |
| download | mullvadvpn-99bd27986089de8dd05b839d2b8361cae8aefcda.tar.xz mullvadvpn-99bd27986089de8dd05b839d2b8361cae8aefcda.zip | |
Remove one-to-one relationship between provider and ownership
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 { |