diff options
Diffstat (limited to 'android/src')
3 files changed, 6 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Event.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Event.kt index 23bc01d5a4..e15e1ae071 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Event.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Event.kt @@ -7,8 +7,7 @@ import net.mullvad.mullvadvpn.model.KeygenEvent import net.mullvad.mullvadvpn.model.Settings // Events that can be sent from the service -sealed class Event : Message() { - protected override val messageId = 1 +sealed class Event : Message.EventMessage() { protected override val messageKey = MESSAGE_KEY @Parcelize diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Message.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Message.kt index 872acba8e7..df4811672d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Message.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Message.kt @@ -4,8 +4,10 @@ import android.os.Bundle import android.os.Message as RawMessage import android.os.Parcelable -abstract class Message : Parcelable { - protected abstract val messageId: Int +sealed class Message(private val messageId: Int) : Parcelable { + abstract class EventMessage : Message(1) + abstract class RequestMessage : Message(2) + protected abstract val messageKey: String val message: RawMessage diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt index d85090ac05..8511dec968 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt @@ -5,8 +5,7 @@ import android.os.Messenger import kotlinx.parcelize.Parcelize // Requests that the service can handle -sealed class Request : Message() { - protected override val messageId = 2 +sealed class Request : Message.RequestMessage() { protected override val messageKey = MESSAGE_KEY @Parcelize |