summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-02-17 15:49:35 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-02-19 12:25:32 +0000
commit518e37a7cb5180fab3270bbcfebfd5285ea33dad (patch)
tree86c73604aa3613cf80f6ff20865e362b3d0d78d7 /android
parentad1585616a2b12256363a99029059d26459b0b02 (diff)
downloadmullvadvpn-518e37a7cb5180fab3270bbcfebfd5285ea33dad.tar.xz
mullvadvpn-518e37a7cb5180fab3270bbcfebfd5285ea33dad.zip
Make some enum variants data classes
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt3
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt6
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt2
3 files changed, 6 insertions, 5 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt
index 7ccb75e3c1..ecb3ae3303 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt
@@ -2,7 +2,8 @@ package net.mullvad.mullvadvpn.model
sealed class Constraint<T>() {
class Any<T>() : Constraint<T>()
- class Only<T>(val value: T) : Constraint<T>() {
+
+ data class Only<T>(val value: T) : Constraint<T>() {
fun get0() = value
}
}
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt
index 039f10a411..79e4cf059f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt
@@ -1,17 +1,17 @@
package net.mullvad.mullvadvpn.model
sealed class LocationConstraint(val code: Array<String>) {
- class Country(var countryCode: String) : LocationConstraint(arrayOf(countryCode)) {
+ data class Country(var countryCode: String) : LocationConstraint(arrayOf(countryCode)) {
fun get0() = countryCode
}
- class City(var countryCode: String, var cityCode: String) :
+ data class City(var countryCode: String, var cityCode: String) :
LocationConstraint(arrayOf(countryCode, cityCode)) {
fun get0() = countryCode
fun get1() = cityCode
}
- class Hostname(var countryCode: String, var cityCode: String, var hostname: String) :
+ data class Hostname(var countryCode: String, var cityCode: String, var hostname: String) :
LocationConstraint(arrayOf(countryCode, cityCode, hostname)) {
fun get0() = countryCode
fun get1() = cityCode
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
index 51a6e48cca..eb606f7aa5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
@@ -3,7 +3,7 @@ package net.mullvad.mullvadvpn.model
sealed class RelaySettingsUpdate {
class CustomTunnelEndpoint() : RelaySettingsUpdate()
- class Normal(var constraints: RelayConstraintsUpdate) : RelaySettingsUpdate() {
+ data class Normal(var constraints: RelayConstraintsUpdate) : RelaySettingsUpdate() {
fun get0() = constraints
}
}