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

cargo fmt

Browse Source
This commit is contained in:
holger krekel
2019-10-07 00:15:15 +02:00
parent 51534b2fae
commit b8f211a013
4 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deltachat-ffi/src/lib.rs
View File

@@ -1620,9 +1620,7 @@ pub unsafe extern "C" fn dc_stop_ongoing_process(context: *mut dc_context_t) {
return; return;
} }
let ffi_context = &*context; let ffi_context = &*context;
ffi_context ffi_context.with_inner(|ctx| ctx.stop_ongoing()).ok();
.with_inner(|ctx| ctx.stop_ongoing())
.ok();
} }
#[no_mangle] #[no_mangle]

8
src/context.rs
View File

@@ -269,11 +269,15 @@ impl Context {
} }
pub fn shall_stop_ongoing(&self) -> bool { pub fn shall_stop_ongoing(&self) -> bool {
self.running_state.clone().read().unwrap().shall_stop_ongoing self.running_state
.clone()
.read()
.unwrap()
.shall_stop_ongoing
} }
/******************************************************************************* /*******************************************************************************
* UI chat/message related API * UI chat/message related API
******************************************************************************/ ******************************************************************************/
pub fn get_info(&self) -> HashMap<&'static str, String> { pub fn get_info(&self) -> HashMap<&'static str, String> {

65
src/imex.rs
View File

@@ -114,44 +114,44 @@ pub fn initiate_key_transfer(context: &Context) -> Result<String> {
let res = do_initiate_key_transfer(context); let res = do_initiate_key_transfer(context);
context.free_ongoing(); context.free_ongoing();
res res
} }
fn do_initiate_key_transfer(context: &Context) -> Result<String> { fn do_initiate_key_transfer(context: &Context) -> Result<String> {
let mut msg: Message; let mut msg: Message;
let setup_code = create_setup_code(context); let setup_code = create_setup_code(context);
/* this may require a keypair to be created. this may take a second ... */ /* this may require a keypair to be created. this may take a second ... */
ensure!(!context.shall_stop_ongoing(), "canceled"); ensure!(!context.shall_stop_ongoing(), "canceled");
let setup_file_content = render_setup_file(context, &setup_code)?; let setup_file_content = render_setup_file(context, &setup_code)?;
/* encrypting may also take a while ... */ /* encrypting may also take a while ... */
ensure!(!context.shall_stop_ongoing(), "canceled"); ensure!(!context.shall_stop_ongoing(), "canceled");
let setup_file_name = context.new_blob_file( let setup_file_name = context.new_blob_file(
"autocrypt-setup-message.html", "autocrypt-setup-message.html",
setup_file_content.as_bytes(), setup_file_content.as_bytes(),
)?; )?;
let chat_id = chat::create_by_contact_id(context, 1)?;
msg = Message::default();
msg.type_0 = Viewtype::File;
msg.param.set(Param::File, setup_file_name);
msg.param let chat_id = chat::create_by_contact_id(context, 1)?;
.set(Param::MimeType, "application/autocrypt-setup"); msg = Message::default();
msg.param.set_int(Param::Cmd, 6); msg.type_0 = Viewtype::File;
msg.param msg.param.set(Param::File, setup_file_name);
.set_int(Param::ForcePlaintext, DC_FP_NO_AUTOCRYPT_HEADER);
ensure!(!context.shall_stop_ongoing(), "canceled"); msg.param
let msg_id = chat::send_msg(context, chat_id, &mut msg)?; .set(Param::MimeType, "application/autocrypt-setup");
info!(context, "Wait for setup message being sent ...",); msg.param.set_int(Param::Cmd, 6);
while !context.shall_stop_ongoing() { msg.param
std::thread::sleep(std::time::Duration::from_secs(1)); .set_int(Param::ForcePlaintext, DC_FP_NO_AUTOCRYPT_HEADER);
if let Ok(msg) = Message::load_from_db(context, msg_id) {
if msg.is_sent() { ensure!(!context.shall_stop_ongoing(), "canceled");
info!(context, "... setup message sent.",); let msg_id = chat::send_msg(context, chat_id, &mut msg)?;
break; info!(context, "Wait for setup message being sent ...",);
} while !context.shall_stop_ongoing() {
} std::thread::sleep(std::time::Duration::from_secs(1));
} if let Ok(msg) = Message::load_from_db(context, msg_id) {
if msg.is_sent() {
info!(context, "... setup message sent.",);
break;
}
}
}
Ok(setup_code) Ok(setup_code)
} }
@@ -598,7 +598,10 @@ fn add_files_to_export(context: &Context, dest_path_filename: &PathBuf) -> Resul
let mut processed_files_cnt = 0; let mut processed_files_cnt = 0;
for entry in dir_handle { for entry in dir_handle {
let entry = entry?; let entry = entry?;
ensure!(!context.shall_stop_ongoing(), "canceled during export-files"); ensure!(
!context.shall_stop_ongoing(),
"canceled during export-files"
);
processed_files_cnt += 1; processed_files_cnt += 1;
let permille = max(min(processed_files_cnt * 1000 / total_files_cnt, 990), 10); let permille = max(min(processed_files_cnt * 1000 / total_files_cnt, 990), 10);
context.call_cb(Event::ImexProgress(permille)); context.call_cb(Event::ImexProgress(permille));

2
src/securejoin.rs
View File

@@ -156,7 +156,7 @@ pub fn dc_join_securejoin(context: &Context, qr: &str) -> u32 {
bob.qr_scan = None; bob.qr_scan = None;
if ongoing_allocated { if ongoing_allocated {
context.free_ongoing(); context.free_ongoing();
} }
ret_chat_id as u32 ret_chat_id as u32
}; };