diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-30 15:15:21 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-31 14:36:30 +0000 |
| commit | d0a879acf854046900b755b405e9ef5b49c52943 (patch) | |
| tree | bd05fa6311c370df52753ef3b23b4304463d40b0 /android/src | |
| parent | afa8cea611744de08125ac52215cc764f4a84eed (diff) | |
| download | mullvadvpn-d0a879acf854046900b755b405e9ef5b49c52943.tar.xz mullvadvpn-d0a879acf854046900b755b405e9ef5b49c52943.zip | |
Centralize where `messageId` is configured
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 |