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

cargo fmt

Browse Source
This commit is contained in:
holger krekel
2019-08-17 00:44:13 +02:00
parent ff1f286882
commit 5ea2da4245
1 changed files with 100 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
src/dc_qr.rs
View File

@@ -189,122 +189,107 @@ pub unsafe fn dc_check_qr(context: &Context, qr: *const libc::c_char) -> *mut dc
} }
} }
if ok_to_continue { if ok_to_continue {
/* check the parameters /* check the parameters
---------------------- */ ---------------------- */
if !addr.is_null() { if !addr.is_null() {
/* urldecoding is needed at least for OPENPGP4FPR but should not hurt in the other cases */ /* urldecoding is needed at least for OPENPGP4FPR but should not hurt in the other cases */
let mut temp: *mut libc::c_char = dc_urldecode(addr); let mut temp: *mut libc::c_char = dc_urldecode(addr);
free(addr as *mut libc::c_void); free(addr as *mut libc::c_void);
addr = temp; addr = temp;
temp = addr_normalize(as_str(addr)).strdup(); temp = addr_normalize(as_str(addr)).strdup();
free(addr as *mut libc::c_void); free(addr as *mut libc::c_void);
addr = temp; addr = temp;
if !may_be_valid_addr(as_str(addr)) { if !may_be_valid_addr(as_str(addr)) {
(*qr_parsed).state = 400i32; (*qr_parsed).state = 400i32;
(*qr_parsed).text1 = dc_strdup( (*qr_parsed).text1 =
b"Bad e-mail address.\x00" as *const u8 as *const libc::c_char, dc_strdup(b"Bad e-mail address.\x00" as *const u8 as *const libc::c_char);
); ok_to_continue = false;
ok_to_continue = false;
}
}
}
if ok_to_continue && !fingerprint.is_null() && strlen(fingerprint) != 40 {
(*qr_parsed).state = 400i32;
(*qr_parsed).text1 = dc_strdup(
b"Bad fingerprint length in QR code.\x00" as *const u8
as *const libc::c_char,
);
ok_to_continue = false;
} }
if ok_to_continue { }
if !fingerprint.is_null() { }
let peerstate = Peerstate::from_fingerprint( if ok_to_continue && !fingerprint.is_null() && strlen(fingerprint) != 40 {
context, (*qr_parsed).state = 400i32;
&context.sql, (*qr_parsed).text1 = dc_strdup(
as_str(fingerprint), b"Bad fingerprint length in QR code.\x00" as *const u8 as *const libc::c_char,
); );
if addr.is_null() || invitenumber.is_null() || auth.is_null() { ok_to_continue = false;
if let Some(peerstate) = peerstate { }
(*qr_parsed).state = 210i32; if ok_to_continue {
let addr = peerstate if !fingerprint.is_null() {
.addr let peerstate =
.as_ref() Peerstate::from_fingerprint(context, &context.sql, as_str(fingerprint));
.map(|s| s.as_str()) if addr.is_null() || invitenumber.is_null() || auth.is_null() {
.unwrap_or_else(|| ""); if let Some(peerstate) = peerstate {
(*qr_parsed).id = Contact::add_or_lookup( (*qr_parsed).state = 210i32;
context, let addr = peerstate
"", .addr
addr, .as_ref()
Origin::UnhandledQrScan, .map(|s| s.as_str())
) .unwrap_or_else(|| "");
.map(|(id, _)| id) (*qr_parsed).id =
.unwrap_or_default(); Contact::add_or_lookup(context, "", addr, Origin::UnhandledQrScan)
dc_create_or_lookup_nchat_by_contact_id( .map(|(id, _)| id)
context, .unwrap_or_default();
(*qr_parsed).id, dc_create_or_lookup_nchat_by_contact_id(
2i32, context,
&mut chat_id, (*qr_parsed).id,
0 as *mut libc::c_int, 2i32,
); &mut chat_id,
device_msg = dc_mprintf( 0 as *mut libc::c_int,
b"%s verified.\x00" as *const u8 );
as *const libc::c_char, device_msg = dc_mprintf(
peerstate.addr, b"%s verified.\x00" as *const u8 as *const libc::c_char,
) peerstate.addr,
} else { )
(*qr_parsed).text1 = } else {
dc_format_fingerprint_c(fingerprint); (*qr_parsed).text1 = dc_format_fingerprint_c(fingerprint);
(*qr_parsed).state = 230i32 (*qr_parsed).state = 230i32
} }
} else { } else {
if !grpid.is_null() && !grpname.is_null() { if !grpid.is_null() && !grpname.is_null() {
(*qr_parsed).state = 202i32; (*qr_parsed).state = 202i32;
(*qr_parsed).text1 = dc_strdup(grpname); (*qr_parsed).text1 = dc_strdup(grpname);
(*qr_parsed).text2 = dc_strdup(grpid) (*qr_parsed).text2 = dc_strdup(grpid)
} else { } else {
(*qr_parsed).state = 200i32 (*qr_parsed).state = 200i32
} }
(*qr_parsed).id = Contact::add_or_lookup( (*qr_parsed).id = Contact::add_or_lookup(
context, context,
as_str(name), as_str(name),
as_str(addr), as_str(addr),
Origin::UnhandledQrScan, Origin::UnhandledQrScan,
) )
.map(|(id, _)| id) .map(|(id, _)| id)
.unwrap_or_default(); .unwrap_or_default();
(*qr_parsed).fingerprint = dc_strdup(fingerprint); (*qr_parsed).fingerprint = dc_strdup(fingerprint);
(*qr_parsed).invitenumber = dc_strdup(invitenumber); (*qr_parsed).invitenumber = dc_strdup(invitenumber);
(*qr_parsed).auth = dc_strdup(auth) (*qr_parsed).auth = dc_strdup(auth)
} }
} else if !addr.is_null() { } else if !addr.is_null() {
(*qr_parsed).state = 320i32; (*qr_parsed).state = 320i32;
(*qr_parsed).id = Contact::add_or_lookup( (*qr_parsed).id = Contact::add_or_lookup(
context, context,
as_str(name), as_str(name),
as_str(addr), as_str(addr),
Origin::UnhandledQrScan, Origin::UnhandledQrScan,
) )
.map(|(id, _)| id) .map(|(id, _)| id)
.unwrap_or_default(); .unwrap_or_default();
} else if strstr( } else if strstr(qr, b"http://\x00" as *const u8 as *const libc::c_char)
qr, == qr as *mut libc::c_char
b"http://\x00" as *const u8 as *const libc::c_char, || strstr(qr, b"https://\x00" as *const u8 as *const libc::c_char)
) == qr as *mut libc::c_char == qr as *mut libc::c_char
|| strstr( {
qr, (*qr_parsed).state = 332i32;
b"https://\x00" as *const u8 as *const libc::c_char, (*qr_parsed).text1 = dc_strdup(qr)
) == qr as *mut libc::c_char } else {
{ (*qr_parsed).state = 330i32;
(*qr_parsed).state = 332i32; (*qr_parsed).text1 = dc_strdup(qr)
(*qr_parsed).text1 = dc_strdup(qr) }
} else { if !device_msg.is_null() {
(*qr_parsed).state = 330i32; dc_add_device_msg(context, chat_id, device_msg);
(*qr_parsed).text1 = dc_strdup(qr) }
} }
if !device_msg.is_null() {
dc_add_device_msg(context, chat_id, device_msg);
}
}
} }
free(addr as *mut libc::c_void); free(addr as *mut libc::c_void);
free(fingerprint as *mut libc::c_void); free(fingerprint as *mut libc::c_void);