Use new error enum. in `VoucherSubmissionResult`

2 files changed, 10 insertions, 16 deletions

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 319bf18a79..b78957d5c0 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt
@@ -8,14 +8,5 @@ sealed class VoucherSubmissionResult : Parcelable {
     data class Ok(val submission: VoucherSubmission) : VoucherSubmissionResult()
 
     @Parcelize
-    object InvalidVoucher : VoucherSubmissionResult()
-
-    @Parcelize
-    object VoucherAlreadyUsed : VoucherSubmissionResult()
-
-    @Parcelize
-    object RpcError : VoucherSubmissionResult()
-
-    @Parcelize
-    object OtherError : VoucherSubmissionResult()
+    data class Error(val error: VoucherSubmissionError) : VoucherSubmissionResult()
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
index 9661d4ad4b..a25ac6a1d8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
@@ -14,6 +14,7 @@ import android.widget.EditText
 import android.widget.TextView
 import androidx.fragment.app.DialogFragment
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.model.VoucherSubmissionError
 import net.mullvad.mullvadvpn.model.VoucherSubmissionResult
 import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache
 import net.mullvad.mullvadvpn.ui.serviceconnection.VoucherRedeemer
@@ -136,11 +137,7 @@ class RedeemVoucherDialogFragment : DialogFragment() {
 
         when (result) {
             is VoucherSubmissionResult.Ok -> handleAddedTime(result.submission.timeAdded)
-            is VoucherSubmissionResult.InvalidVoucher -> showError(R.string.invalid_voucher)
-            is VoucherSubmissionResult.VoucherAlreadyUsed -> {
-                showError(R.string.voucher_already_used)
-            }
-            else -> showError(R.string.error_occurred)
+            is VoucherSubmissionResult.Error -> showError(result.error)
         }
     }
 
@@ -154,7 +151,13 @@ class RedeemVoucherDialogFragment : DialogFragment() {
         }
     }
 
-    private fun showError(message: Int) {
+    private fun showError(error: VoucherSubmissionError) {
+        val message = when (error) {
+            VoucherSubmissionError.InvalidVoucher -> R.string.invalid_voucher
+            VoucherSubmissionError.VoucherAlreadyUsed -> R.string.voucher_already_used
+            else -> R.string.error_occurred
+        }
+
         errorMessage.apply {
             setText(message)
             visibility = View.VISIBLE