Use `VoucherSubmissionResult` instead

2 files changed, 10 insertions, 7 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index fbede31252..3c55f76b7f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -9,7 +9,7 @@ import net.mullvad.mullvadvpn.model.RelayList
 import net.mullvad.mullvadvpn.model.RelaySettingsUpdate
 import net.mullvad.mullvadvpn.model.Settings
 import net.mullvad.mullvadvpn.model.TunnelState
-import net.mullvad.mullvadvpn.model.VoucherSubmission
+import net.mullvad.mullvadvpn.model.VoucherSubmissionResult
 import net.mullvad.talpid.util.EventNotifier
 
 class MullvadDaemon(val vpnService: MullvadVpnService) {
@@ -110,7 +110,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
         shutdown(daemonInterfaceAddress)
     }
 
-    fun submitVoucher(voucher: String): VoucherSubmission? {
+    fun submitVoucher(voucher: String): VoucherSubmissionResult {
         return submitVoucher(daemonInterfaceAddress, voucher)
     }
 
@@ -155,7 +155,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
     private external fun submitVoucher(
         daemonInterfaceAddress: Long,
         voucher: String
-    ): VoucherSubmission?
+    ): VoucherSubmissionResult
     private external fun updateRelaySettings(
         daemonInterfaceAddress: Long,
         update: RelaySettingsUpdate
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 59ccf623f2..dde5da6e82 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
@@ -13,6 +13,7 @@ import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams
 import android.widget.EditText
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.model.VoucherSubmissionResult
 import net.mullvad.mullvadvpn.service.MullvadDaemon
 import net.mullvad.mullvadvpn.ui.widget.Button
 import net.mullvad.mullvadvpn.util.JobTracker
@@ -120,13 +121,15 @@ class RedeemVoucherDialogFragment : DialogFragment() {
     }
 
     private suspend fun submitVoucher() {
-        val submission = jobTracker.runOnBackground {
+        val result = jobTracker.runOnBackground {
             daemon?.submitVoucher(voucherInput.text.toString())
         }
 
-        submission?.apply {
-            if (timeAdded > 0) {
-                dismiss()
+        when (result) {
+            is VoucherSubmissionResult.Ok -> {
+                if (result.submission.timeAdded > 0) {
+                    dismiss()
+                }
             }
         }
     }