Merge branch 'create-server-ip-overrides-composable-droid-709'

2 files changed, 14 insertions, 0 deletions

diff --git a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt
index cce2ab1f87..36ea17036e 100644
--- a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt
+++ b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt
@@ -14,6 +14,7 @@ import net.mullvad.mullvadvpn.model.PlayPurchaseVerifyResult
 import net.mullvad.mullvadvpn.model.RelayList
 import net.mullvad.mullvadvpn.model.RemoveDeviceResult
 import net.mullvad.mullvadvpn.model.Settings
+import net.mullvad.mullvadvpn.model.SettingsPatchError
 import net.mullvad.mullvadvpn.model.TunnelState
 import net.mullvad.mullvadvpn.model.UpdateCustomListResult
 
@@ -71,6 +72,10 @@ sealed class Event : Message.EventMessage() {
 
     @Parcelize data class UpdateCustomListResultEvent(val result: UpdateCustomListResult) : Event()
 
+    @Parcelize data class ExportJsonSettingsResult(val json: String) : Event()
+
+    @Parcelize data class ApplyJsonSettingsResult(val error: SettingsPatchError?) : Event()
+
     companion object {
         private const val MESSAGE_KEY = "event"
 
diff --git a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt
index fe9d3b46d9..4bcf871acc 100644
--- a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt
+++ b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt
@@ -13,6 +13,7 @@ import net.mullvad.mullvadvpn.model.Ownership
 import net.mullvad.mullvadvpn.model.PlayPurchase
 import net.mullvad.mullvadvpn.model.Providers
 import net.mullvad.mullvadvpn.model.QuantumResistantState
+import net.mullvad.mullvadvpn.model.RelayOverride
 import net.mullvad.mullvadvpn.model.WireguardConstraints
 
 // Requests that the service can handle
@@ -117,6 +118,14 @@ sealed class Request : Message.RequestMessage() {
 
     @Parcelize data class UpdateCustomList(val customList: CustomList) : Request()
 
+    @Parcelize data object ClearAllRelayOverrides : Request()
+
+    @Parcelize data class ApplyJsonSettings(val json: String) : Request()
+
+    @Parcelize data object ExportJsonSettings : Request()
+
+    @Parcelize data class SetRelayOverride(val override: RelayOverride) : Request()
+
     companion object {
         private const val MESSAGE_KEY = "request"