Prepare to have singleton enum variants

8 files changed, 141 insertions, 20 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt
index 386288676f..bbbfe8065f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt
@@ -2,7 +2,25 @@ package net.mullvad.mullvadvpn.model
 
 sealed class GetAccountDataResult {
     class Ok(val accountData: AccountData) : GetAccountDataResult()
-    class InvalidAccount : GetAccountDataResult()
-    class RpcError : GetAccountDataResult()
-    class OtherError : GetAccountDataResult()
+
+    class InvalidAccount : GetAccountDataResult() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = InvalidAccount()
+        }
+    }
+
+    class RpcError : GetAccountDataResult() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = RpcError()
+        }
+    }
+
+    class OtherError : GetAccountDataResult() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = OtherError()
+        }
+    }
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt
index 7c2e2ddb9d..e719484e76 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt
@@ -16,8 +16,21 @@ sealed class KeygenEvent {
             this.replacementFailure = replacementFailure
         }
     }
-    class TooManyKeys : KeygenEvent()
-    class GenerationFailure : KeygenEvent()
+
+    class TooManyKeys : KeygenEvent() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = TooManyKeys()
+        }
+    }
+
+    class GenerationFailure : KeygenEvent() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = GenerationFailure()
+        }
+    }
+
 
     fun failure(): KeygenFailure? {
         return when (this) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt
index cb53911883..228f6e854a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt
@@ -1,6 +1,12 @@
 package net.mullvad.mullvadvpn.model
 
 sealed class RelaySettings {
-    class CustomTunnelEndpoint() : RelaySettings()
+    class CustomTunnelEndpoint() : RelaySettings() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = CustomTunnelEndpoint()
+        }
+    }
+
     class Normal(var relayConstraints: RelayConstraints) : RelaySettings()
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
index eb606f7aa5..485f69a4a8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
@@ -1,7 +1,12 @@
 package net.mullvad.mullvadvpn.model
 
 sealed class RelaySettingsUpdate {
-    class CustomTunnelEndpoint() : RelaySettingsUpdate()
+    class CustomTunnelEndpoint() : RelaySettingsUpdate() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = CustomTunnelEndpoint()
+        }
+    }
 
     data class Normal(var constraints: RelayConstraintsUpdate) : RelaySettingsUpdate() {
         fun get0() = constraints
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt
index e4b67e2f1b..ca6b482a43 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt
@@ -6,7 +6,13 @@ import net.mullvad.talpid.tunnel.ErrorState
 import net.mullvad.talpid.tunnel.ErrorStateCause
 
 sealed class TunnelState() {
-    class Disconnected() : TunnelState()
+    class Disconnected() : TunnelState() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = Disconnected()
+        }
+    }
+
     class Connecting(val endpoint: TunnelEndpoint?, val location: GeoIpLocation?) : TunnelState()
     class Connected(val endpoint: TunnelEndpoint, val location: GeoIpLocation?) : TunnelState()
     class Disconnecting(val actionAfterDisconnect: ActionAfterDisconnect) : TunnelState()
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt
index 33c57a595a..f8df002632 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt
@@ -2,8 +2,32 @@ package net.mullvad.mullvadvpn.model
 
 sealed class VoucherSubmissionResult {
     class Ok(val submission: VoucherSubmission) : VoucherSubmissionResult()
-    class InvalidVoucher : VoucherSubmissionResult()
-    class VoucherAlreadyUsed : VoucherSubmissionResult()
-    class RpcError : VoucherSubmissionResult()
-    class OtherError : VoucherSubmissionResult()
+
+    class InvalidVoucher : VoucherSubmissionResult() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = InvalidVoucher()
+        }
+    }
+
+    class VoucherAlreadyUsed : VoucherSubmissionResult() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = VoucherAlreadyUsed()
+        }
+    }
+
+    class RpcError : VoucherSubmissionResult() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = RpcError()
+        }
+    }
+
+    class OtherError : VoucherSubmissionResult() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = OtherError()
+        }
+    }
 }
diff --git a/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt b/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt
index dfa82852f1..c9eac5598c 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt
+++ b/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt
@@ -19,6 +19,17 @@ sealed class CreateTunResult {
             get() = true
     }
 
-    class PermissionDenied : CreateTunResult()
-    class TunnelDeviceError : CreateTunResult()
+    class PermissionDenied : CreateTunResult() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = PermissionDenied()
+        }
+    }
+
+    class TunnelDeviceError : CreateTunResult() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = TunnelDeviceError()
+        }
+    }
 }
diff --git a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt
index 22962630b6..2ae5684d55 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt
+++ b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt
@@ -4,12 +4,50 @@ import java.net.InetAddress
 
 sealed class ErrorStateCause {
     class AuthFailed(val reason: String?) : ErrorStateCause()
-    class Ipv6Unavailable : ErrorStateCause()
-    class SetFirewallPolicyError : ErrorStateCause()
-    class SetDnsError : ErrorStateCause()
+
+    class Ipv6Unavailable : ErrorStateCause() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = Ipv6Unavailable()
+        }
+    }
+
+    class SetFirewallPolicyError : ErrorStateCause() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = SetFirewallPolicyError()
+        }
+    }
+
+    class SetDnsError : ErrorStateCause() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = SetDnsError()
+        }
+    }
+
     class InvalidDnsServers(val addresses: ArrayList<InetAddress>) : ErrorStateCause()
-    class StartTunnelError : ErrorStateCause()
+
+    class StartTunnelError : ErrorStateCause() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = StartTunnelError()
+        }
+    }
+
     class TunnelParameterError(val error: ParameterGenerationError) : ErrorStateCause()
-    class IsOffline : ErrorStateCause()
-    class VpnPermissionDenied : ErrorStateCause()
+
+    class IsOffline : ErrorStateCause() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = IsOffline()
+        }
+    }
+
+    class VpnPermissionDenied : ErrorStateCause() {
+        companion object {
+            @JvmStatic
+            val INSTANCE = VpnPermissionDenied()
+        }
+    }
 }