Derive `IntoJava` for `RelaySettings`

2 files changed, 6 insertions, 4 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt
index 32b3c10ba7..7d016821a4 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.MainActivity
 import net.mullvad.mullvadvpn.MullvadDaemon
 import net.mullvad.mullvadvpn.model.Constraint
+import net.mullvad.mullvadvpn.model.RelayConstraints
 import net.mullvad.mullvadvpn.model.RelaySettings
 import net.mullvad.mullvadvpn.relaylist.RelayItem
 import net.mullvad.mullvadvpn.relaylist.RelayList
@@ -78,7 +79,8 @@ class RelayListListener(val parentActivity: MainActivity) {
         synchronized(this) {
             val relayList = this.relayList
 
-            relaySettings = newRelaySettings ?: RelaySettings.RelayConstraints(Constraint.Any())
+            relaySettings = newRelaySettings
+                ?: RelaySettings.Normal(RelayConstraints(Constraint.Any()))
 
             if (relayList != null) {
                 relayListChanged(relayList)
@@ -100,8 +102,8 @@ class RelayListListener(val parentActivity: MainActivity) {
 
         when (relaySettings) {
             is RelaySettings.CustomTunnelEndpoint -> return null
-            is RelaySettings.RelayConstraints -> {
-                val location = relaySettings.location
+            is RelaySettings.Normal -> {
+                val location = relaySettings.relayConstraints.location
 
                 return relayList?.findItemForLocation(location, true)
             }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt
index 6fded8f9c5..cb53911883 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt
@@ -2,5 +2,5 @@ package net.mullvad.mullvadvpn.model
 
 sealed class RelaySettings {
     class CustomTunnelEndpoint() : RelaySettings()
-    class RelayConstraints(var location: Constraint<LocationConstraint>) : RelaySettings()
+    class Normal(var relayConstraints: RelayConstraints) : RelaySettings()
 }