diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs index 3db4874ca..980b9d8c7 100644 --- a/deltachat-ffi/src/lib.rs +++ b/deltachat-ffi/src/lib.rs @@ -1324,7 +1324,9 @@ pub unsafe extern "C" fn dc_get_securejoin_qr( } let context = &*context; - dc_securejoin::dc_get_securejoin_qr(context, chat_id).unwrap_or("").strdup() + dc_securejoin::dc_get_securejoin_qr(context, chat_id) + .unwrap_or("") + .strdup() } #[no_mangle] diff --git a/examples/repl/main.rs b/examples/repl/main.rs index 27a990789..c4fd6be5a 100644 --- a/examples/repl/main.rs +++ b/examples/repl/main.rs @@ -14,11 +14,11 @@ extern crate lazy_static; extern crate rusqlite; use std::borrow::Cow::{self, Borrowed, Owned}; +use std::io::{self, Write}; +use std::process::Command; use std::ptr; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::{Arc, Mutex, RwLock}; -use std::process::Command; -use std::io::{self, Write}; use deltachat::config; use deltachat::configure::*; @@ -518,16 +518,18 @@ unsafe fn handle_cmd(line: &str, ctx: Arc>) -> Result { start_threads(ctx.clone()); - if let Some(mut qr) = dc_get_securejoin_qr(&ctx.read().unwrap(), arg1.parse().unwrap_or_default()) { + if let Some(mut qr) = + dc_get_securejoin_qr(&ctx.read().unwrap(), arg1.parse().unwrap_or_default()) + { if !qr.is_empty() { if arg0 == "getbadqr" && qr.len() > 40 { qr.replace_range(12..22, "0000000000") } println!("{}", qr); let output = Command::new("qrencode") - .args(&["-t", "ansiutf8", qr.as_str(), "-o", "-"]) - .output() - .expect("failed to execute process"); + .args(&["-t", "ansiutf8", qr.as_str(), "-o", "-"]) + .output() + .expect("failed to execute process"); io::stdout().write_all(&output.stdout).unwrap(); io::stderr().write_all(&output.stderr).unwrap(); } diff --git a/src/dc_securejoin.rs b/src/dc_securejoin.rs index c1b90ffd0..a1d26b9ea 100644 --- a/src/dc_securejoin.rs +++ b/src/dc_securejoin.rs @@ -22,13 +22,9 @@ use crate::stock::StockMessage; use crate::types::*; use crate::x::*; -pub const NON_ALPHANUMERIC_WITHOUT_DOT: &AsciiSet = &NON_ALPHANUMERIC - .remove(b'.'); +pub const NON_ALPHANUMERIC_WITHOUT_DOT: &AsciiSet = &NON_ALPHANUMERIC.remove(b'.'); -pub unsafe fn dc_get_securejoin_qr( - context: &Context, - group_chat_id: uint32_t, -) -> Option { +pub unsafe fn dc_get_securejoin_qr(context: &Context, group_chat_id: uint32_t) -> Option { /* ========================================================= ==== Alice - the inviter side ==== ==== Step 1 in "Setup verified contact" protocol ==== @@ -61,7 +57,6 @@ pub unsafe fn dc_get_securejoin_qr( }); let self_addr = context.sql.get_config(context, "configured_addr"); - if self_addr.is_none() { error!(context, 0, "Not configured, cannot generate QR code.",); return cleanup(fingerprint, qr); @@ -79,8 +74,10 @@ pub unsafe fn dc_get_securejoin_qr( return cleanup(fingerprint, qr); } - let self_addr_urlencoded = utf8_percent_encode(&self_addr, NON_ALPHANUMERIC_WITHOUT_DOT).to_string(); - let self_name_urlencoded = utf8_percent_encode(&self_name, NON_ALPHANUMERIC_WITHOUT_DOT).to_string(); + let self_addr_urlencoded = + utf8_percent_encode(&self_addr, NON_ALPHANUMERIC_WITHOUT_DOT).to_string(); + let self_name_urlencoded = + utf8_percent_encode(&self_name, NON_ALPHANUMERIC_WITHOUT_DOT).to_string(); qr = if 0 != group_chat_id { if let Ok(chat) = Chat::load_from_db(context, group_chat_id) {