Merge branch 'add-support-for-custom-list-in-the-app-layer-droid-653'

2 files changed, 11 insertions, 3 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 69c28bb379..1136ae8c55 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
@@ -65,6 +65,8 @@ sealed class Event : Message.EventMessage() {
 
     @Parcelize object VpnPermissionRequest : Event()
 
+    @Parcelize data class CreateCustomListResult(val listId: String) : 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 267f1f2619..fe9d3b46d9 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
@@ -5,8 +5,9 @@ import android.os.Messenger
 import java.net.InetAddress
 import kotlinx.parcelize.Parcelize
 import net.mullvad.mullvadvpn.model.Constraint
+import net.mullvad.mullvadvpn.model.CustomList
 import net.mullvad.mullvadvpn.model.DnsOptions
-import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
+import net.mullvad.mullvadvpn.model.LocationConstraint
 import net.mullvad.mullvadvpn.model.ObfuscationSettings
 import net.mullvad.mullvadvpn.model.Ownership
 import net.mullvad.mullvadvpn.model.PlayPurchase
@@ -77,8 +78,7 @@ sealed class Request : Message.RequestMessage() {
 
     @Parcelize data class SetEnableSplitTunneling(val enable: Boolean) : Request()
 
-    @Parcelize
-    data class SetRelayLocation(val relayLocation: GeographicLocationConstraint) : Request()
+    @Parcelize data class SetRelayLocation(val locationConstraint: LocationConstraint) : Request()
 
     @Parcelize data class SetWireGuardMtu(val mtu: Int?) : Request()
 
@@ -111,6 +111,12 @@ sealed class Request : Message.RequestMessage() {
         val providers: Constraint<Providers>
     ) : Request()
 
+    @Parcelize data class CreateCustomList(val name: String) : Request()
+
+    @Parcelize data class DeleteCustomList(val id: String) : Request()
+
+    @Parcelize data class UpdateCustomList(val customList: CustomList) : Request()
+
     companion object {
         private const val MESSAGE_KEY = "request"