diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-02-18 17:46:46 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-02-19 12:25:32 +0000 |
| commit | ad1585616a2b12256363a99029059d26459b0b02 (patch) | |
| tree | 97f2e8b6c9c26ed35a8184c86a9e83e555df5133 /android | |
| parent | 3dd4ac565538f58a3dcd42c6a23375409993b608 (diff) | |
| download | mullvadvpn-ad1585616a2b12256363a99029059d26459b0b02.tar.xz mullvadvpn-ad1585616a2b12256363a99029059d26459b0b02.zip | |
Make `KeygenFailure` an `enum class`
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt | 12 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt | 4 |
2 files changed, 8 insertions, 8 deletions
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 8f283bdfc9..7c2e2ddb9d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt @@ -21,14 +21,14 @@ sealed class KeygenEvent { fun failure(): KeygenFailure? { return when (this) { - is KeygenEvent.TooManyKeys -> KeygenFailure.TooManyKeys() - is KeygenEvent.GenerationFailure -> KeygenFailure.GenerationFailure() - else -> { null } + is KeygenEvent.TooManyKeys -> KeygenFailure.TooManyKeys + is KeygenEvent.GenerationFailure -> KeygenFailure.GenerationFailure + else -> null } } } -sealed class KeygenFailure() { - class TooManyKeys() : KeygenFailure() - class GenerationFailure() : KeygenFailure() +enum class KeygenFailure { + TooManyKeys, + GenerationFailure, } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt index e49e60165a..edba573f54 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt @@ -306,8 +306,8 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre private fun failureMessage(failure: KeygenFailure): Int { when (failure) { - is KeygenFailure.TooManyKeys -> return R.string.too_many_keys - is KeygenFailure.GenerationFailure -> return R.string.failed_to_generate_key + KeygenFailure.TooManyKeys -> return R.string.too_many_keys + KeygenFailure.GenerationFailure -> return R.string.failed_to_generate_key } } |
