diff options
| author | David Lönnhager <david.l@mullvad.net> | 2023-09-26 14:21:56 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2023-09-26 14:34:36 +0200 |
| commit | 7eb7712e2765e49155120bcb333a06e5f348f7d0 (patch) | |
| tree | 856889f092add8f0f50098c0e283b153dd875bfa | |
| parent | c9deafba75ec38f7bc4631d99417767002980b8e (diff) | |
| download | mullvadvpn-7eb7712e2765e49155120bcb333a06e5f348f7d0.tar.xz mullvadvpn-7eb7712e2765e49155120bcb333a06e5f348f7d0.zip | |
Convert voucher errors correctly in mullvad-jni
| -rw-r--r-- | mullvad-jni/src/lib.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs index 5d062ffbbc..6f33938e99 100644 --- a/mullvad-jni/src/lib.rs +++ b/mullvad-jni/src/lib.rs @@ -180,12 +180,12 @@ impl From<Result<VoucherSubmission, daemon_interface::Error>> for VoucherSubmiss impl From<daemon_interface::Error> for VoucherSubmissionError { fn from(error: daemon_interface::Error) -> Self { match error { - daemon_interface::Error::Api(RestError::ApiError(_, code)) => match code.as_str() { - mullvad_api::INVALID_VOUCHER => VoucherSubmissionError::InvalidVoucher, - mullvad_api::VOUCHER_USED => VoucherSubmissionError::VoucherAlreadyUsed, - _ => VoucherSubmissionError::RpcError, - }, - daemon_interface::Error::Api(_) => VoucherSubmissionError::RpcError, + daemon_interface::Error::OtherError(mullvad_daemon::Error::VoucherSubmission( + device::Error::InvalidVoucher, + )) => VoucherSubmissionError::InvalidVoucher, + daemon_interface::Error::OtherError(mullvad_daemon::Error::VoucherSubmission( + device::Error::UsedVoucher, + )) => VoucherSubmissionError::VoucherAlreadyUsed, _ => VoucherSubmissionError::OtherError, } } |
