Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 21:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove unneccessary check of is_special() + cleanups

Browse Source
This commit is contained in:
holger krekel
2019-10-30 18:57:21 +01:00
parent b0ccbc36d9
commit c56c10bced
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/imex.rs
View File

@@ -231,11 +231,7 @@ pub fn create_setup_code(_context: &Context) -> String {
pub fn continue_key_transfer(context: &Context, msg_id: MsgId, setup_code: &str) -> Result<()> {
ensure!(!msg_id.is_special(), "wrong id");
let msg = Message::load_from_db(context, msg_id);
if msg.is_err() {
bail!("Message is no Autocrypt Setup Message.");
}
let msg = msg.unwrap_or_default();
let msg = Message::load_from_db(context, msg_id)?;
ensure!(
msg.is_setupmessage(),
"Message is no Autocrypt Setup Message."