Make unit variants singleton objects

4 files changed, 9 insertions, 62 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 bbbfe8065f..cbed622df6 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt
@@ -2,25 +2,7 @@ package net.mullvad.mullvadvpn.model
 
 sealed class GetAccountDataResult {
     class Ok(val accountData: AccountData) : 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()
-        }
-    }
+    object InvalidAccount : GetAccountDataResult()
+    object RpcError : GetAccountDataResult()
+    object OtherError : GetAccountDataResult()
 }
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 228f6e854a..f46bd63e67 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt
@@ -1,12 +1,6 @@
 package net.mullvad.mullvadvpn.model
 
 sealed class RelaySettings {
-    class CustomTunnelEndpoint() : RelaySettings() {
-        companion object {
-            @JvmStatic
-            val INSTANCE = CustomTunnelEndpoint()
-        }
-    }
-
+    object CustomTunnelEndpoint : RelaySettings()
     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 485f69a4a8..6ae7ca453d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
@@ -1,12 +1,7 @@
 package net.mullvad.mullvadvpn.model
 
 sealed class RelaySettingsUpdate {
-    class CustomTunnelEndpoint() : RelaySettingsUpdate() {
-        companion object {
-            @JvmStatic
-            val INSTANCE = CustomTunnelEndpoint()
-        }
-    }
+    object CustomTunnelEndpoint : RelaySettingsUpdate()
 
     data class Normal(var constraints: RelayConstraintsUpdate) : RelaySettingsUpdate() {
         fun get0() = constraints
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 f8df002632..6978ebba73 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt
@@ -2,32 +2,8 @@ package net.mullvad.mullvadvpn.model
 
 sealed class VoucherSubmissionResult {
     class Ok(val submission: VoucherSubmission) : 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()
-        }
-    }
+    object InvalidVoucher : VoucherSubmissionResult()
+    object VoucherAlreadyUsed : VoucherSubmissionResult()
+    object RpcError : VoucherSubmissionResult()
+    object OtherError : VoucherSubmissionResult()
 }