Merge branch 'use-jnix-from-java'

5 files changed, 24 insertions, 7 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 97b3414176..7ccb75e3c1 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt
@@ -2,5 +2,7 @@ package net.mullvad.mullvadvpn.model
 
 sealed class Constraint<T>() {
     class Any<T>() : Constraint<T>()
-    class Only<T>(val value: T) : Constraint<T>()
+    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 302a464eaf..039f10a411 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt
@@ -1,11 +1,20 @@
 package net.mullvad.mullvadvpn.model
 
 sealed class LocationConstraint(val code: Array<String>) {
-    class Country(var countryCode: String) : LocationConstraint(arrayOf(countryCode))
+    class Country(var countryCode: String) : LocationConstraint(arrayOf(countryCode)) {
+        fun get0() = countryCode
+    }
 
     class City(var countryCode: String, var cityCode: String) :
-        LocationConstraint(arrayOf(countryCode, cityCode))
+        LocationConstraint(arrayOf(countryCode, cityCode)) {
+        fun get0() = countryCode
+        fun get1() = cityCode
+    }
 
     class Hostname(var countryCode: String, var cityCode: String, var hostname: String) :
-        LocationConstraint(arrayOf(countryCode, cityCode, hostname))
+        LocationConstraint(arrayOf(countryCode, cityCode, hostname)) {
+        fun get0() = countryCode
+        fun get1() = cityCode
+        fun get2() = hostname
+    }
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt
new file mode 100644
index 0000000000..94aa58c56a
--- /dev/null
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt
@@ -0,0 +1,3 @@
+package net.mullvad.mullvadvpn.model
+
+data class RelayConstraintsUpdate(var location: Constraint<LocationConstraint>?)
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 7a24688768..51a6e48cca 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
@@ -2,6 +2,8 @@ package net.mullvad.mullvadvpn.model
 
 sealed class RelaySettingsUpdate {
     class CustomTunnelEndpoint() : RelaySettingsUpdate()
-    class RelayConstraintsUpdate(var location: Constraint<LocationConstraint>?) :
-        RelaySettingsUpdate()
+
+    class Normal(var constraints: RelayConstraintsUpdate) : RelaySettingsUpdate() {
+        fun get0() = constraints
+    }
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt
index 8f95f2ce79..8b5f8e8c0a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt
@@ -17,6 +17,7 @@ import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.Constraint
 import net.mullvad.mullvadvpn.model.KeygenEvent
 import net.mullvad.mullvadvpn.model.LocationConstraint
+import net.mullvad.mullvadvpn.model.RelayConstraintsUpdate
 import net.mullvad.mullvadvpn.model.RelaySettingsUpdate
 import net.mullvad.mullvadvpn.relaylist.RelayItem
 import net.mullvad.mullvadvpn.relaylist.RelayItemDividerDecoration
@@ -90,7 +91,7 @@ class SelectLocationFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc
         val constraint: Constraint<LocationConstraint> =
             relayItem?.run { Constraint.Only(location) } ?: Constraint.Any()
 
-        daemon.updateRelaySettings(RelaySettingsUpdate.RelayConstraintsUpdate(constraint))
+        daemon.updateRelaySettings(RelaySettingsUpdate.Normal(RelayConstraintsUpdate(constraint)))
     }
 
     private fun updateRelayList(relayList: RelayList, selectedItem: RelayItem?) =