From ffe74861cc2b59ad8dd7b9239765668707562c41 Mon Sep 17 00:00:00 2001 From: Andy Balaam Date: Thu, 12 Dec 2024 16:13:24 +0000 Subject: [PATCH] Refactor ifs into a match MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Damir Jelić Signed-off-by: Andy Balaam --- .../src/types/events/utd_cause.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/matrix-sdk-crypto/src/types/events/utd_cause.rs b/crates/matrix-sdk-crypto/src/types/events/utd_cause.rs index 85219b239a1..ea39c61dae3 100644 --- a/crates/matrix-sdk-crypto/src/types/events/utd_cause.rs +++ b/crates/matrix-sdk-crypto/src/types/events/utd_cause.rs @@ -217,19 +217,19 @@ impl UtdCause { * ``` */ fn determine_historical(crypto_context_info: CryptoContextInfo) -> UtdCause { - if crypto_context_info.backup_exists_on_server { - if crypto_context_info.is_backup_configured - || crypto_context_info.this_device_is_verified - { + let backup_exist = crypto_context_info.backup_exists_on_server; + let is_backup_configured = crypto_context_info.is_backup_configured; + let are_we_verified = crypto_context_info.this_device_is_verified; + + match (backup_exist, is_backup_configured || are_we_verified) { + (true, true) => { // Either backup download is working but we still don't have the key, or backup // download *isn't* working despite being verified. In either // case, we shrug and give an `Unknown` cause. UtdCause::Unknown - } else { - UtdCause::HistoricalMessageAndDeviceIsUnverified } - } else { - UtdCause::HistoricalMessageAndBackupIsDisabled + (true, false) => UtdCause::HistoricalMessageAndDeviceIsUnverified, + (false, _) => UtdCause::HistoricalMessageAndBackupIsDisabled, } } }