Merge branch 'code-clean-up-for-conditional-statements-droid-541'

mullvad · Dec 4, 2023 · 25788c6 · 25788c6
2 parents 12dc193 + 5ff2638
commit 25788c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VoucherDialogViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VoucherDialogViewModel.kt
@@ -60,9 +60,7 @@ class VoucherDialogViewModel(
             when (val result = serviceConnectionManager.voucherRedeemer()?.submit(voucherCode)) {
                 is VoucherSubmissionResult.Ok -> handleAddedTime(result.submission.timeAdded)
                 is VoucherSubmissionResult.Error -> setError(result.error)
-                else -> {
-                    vmState.update { VoucherDialogState.Default }
-                }
+                null -> vmState.update { VoucherDialogState.Default }
             }
         }
     }
@@ -88,7 +86,8 @@ class VoucherDialogViewModel(
                     when (error) {
                         VoucherSubmissionError.InvalidVoucher -> R.string.invalid_voucher
                         VoucherSubmissionError.VoucherAlreadyUsed -> R.string.voucher_already_used
-                        else -> R.string.error_occurred
+                        VoucherSubmissionError.RpcError,
+                        VoucherSubmissionError.OtherError -> R.string.error_occurred
                     }
                 )
             vmState.update { VoucherDialogState.Error(message) }

diff --git a/...e/src/main/kotlin/net/mullvad/mullvadvpn/service/persistence/SplitTunnelingPersistence.kt b/...e/src/main/kotlin/net/mullvad/mullvadvpn/service/persistence/SplitTunnelingPersistence.kt
@@ -29,9 +29,6 @@ class SplitTunnelingPersistence(context: Context) {
         }
 
     private fun loadExcludedApps(): Set<String> {
-        return when {
-            appListFile.exists() -> appListFile.readLines().toSet()
-            else -> emptySet()
-        }
+        return if (appListFile.exists()) appListFile.readLines().toSet() else emptySet()
     }
 }