Replace UpdateRelaySettings with SetRelaySettings

4 files changed, 9 insertions, 24 deletions

diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt
deleted file mode 100644
index 8a382a87d9..0000000000
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package net.mullvad.mullvadvpn.model
-
-data class RelayConstraintsUpdate(
-    val location: Constraint<LocationConstraint>?,
-    val providers: Constraint<Providers>?,
-    val ownership: Constraint<Ownership>?,
-    val wireguardConstraints: WireguardConstraints?
-)
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
deleted file mode 100644
index f8d27f115e..0000000000
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.mullvad.mullvadvpn.model
-
-sealed class RelaySettingsUpdate {
-    object CustomTunnelEndpoint : RelaySettingsUpdate()
-
-    data class Normal(val constraints: RelayConstraintsUpdate) : RelaySettingsUpdate()
-}
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index ceb95a48b7..9110ac08ab 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -19,7 +19,7 @@ import net.mullvad.mullvadvpn.model.PlayPurchaseInitResult
 import net.mullvad.mullvadvpn.model.PlayPurchaseVerifyResult
 import net.mullvad.mullvadvpn.model.QuantumResistantState
 import net.mullvad.mullvadvpn.model.RelayList
-import net.mullvad.mullvadvpn.model.RelaySettingsUpdate
+import net.mullvad.mullvadvpn.model.RelaySettings
 import net.mullvad.mullvadvpn.model.RemoveDeviceEvent
 import net.mullvad.mullvadvpn.model.RemoveDeviceResult
 import net.mullvad.mullvadvpn.model.Settings
@@ -182,8 +182,8 @@ class MullvadDaemon(
         return verifyPlayPurchase(daemonInterfaceAddress, playPurchase)
     }
 
-    fun updateRelaySettings(update: RelaySettingsUpdate) {
-        updateRelaySettings(daemonInterfaceAddress, update)
+    fun setRelaySettings(update: RelaySettings) {
+        setRelaySettings(daemonInterfaceAddress, update)
     }
 
     fun setObfuscationSettings(settings: ObfuscationSettings?) {
@@ -291,7 +291,7 @@ class MullvadDaemon(
 
     private external fun updateRelaySettings(
         daemonInterfaceAddress: Long,
-        update: RelaySettingsUpdate
+        update: RelaySettings
     )
 
     private external fun setObfuscationSettings(
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt
index 6974d804a1..1884b98737 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt
@@ -12,9 +12,9 @@ import net.mullvad.mullvadvpn.lib.ipc.Request
 import net.mullvad.mullvadvpn.model.Constraint
 import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
 import net.mullvad.mullvadvpn.model.LocationConstraint
-import net.mullvad.mullvadvpn.model.RelayConstraintsUpdate
+import net.mullvad.mullvadvpn.model.RelayConstraints
 import net.mullvad.mullvadvpn.model.RelayList
-import net.mullvad.mullvadvpn.model.RelaySettingsUpdate
+import net.mullvad.mullvadvpn.model.RelaySettings
 import net.mullvad.mullvadvpn.model.WireguardConstraints
 import net.mullvad.mullvadvpn.service.MullvadDaemon
 
@@ -95,8 +95,8 @@ class RelayListListener(endpoint: ServiceEndpoint) {
         val wireguardConstraints: WireguardConstraints? = selectedWireguardConstraints
 
         val update =
-            RelaySettingsUpdate.Normal(
-                RelayConstraintsUpdate(
+            RelaySettings.Normal(
+                RelayConstraints(
                     location = location,
                     wireguardConstraints = wireguardConstraints,
                     ownership = Constraint.Any(),
@@ -104,7 +104,7 @@ class RelayListListener(endpoint: ServiceEndpoint) {
                 )
             )
 
-        daemon.await().updateRelaySettings(update)
+        daemon.await().setRelaySettings(update)
     }
 
     companion object {