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

Restore carriage-return handling to how it was in dcc

Browse Source 
Some part of the translation seems to have got this wrong somewhere.
Add a test and restore handling to something more sane again.
This commit is contained in:
Floris Bruynooghe
2019-08-03 00:26:38 +02:00
committed by Floris Bruynooghe
parent d37dda6f50
commit d2b23b727b
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/dc_imex.rs
View File

@@ -241,9 +241,7 @@ pub fn dc_render_setup_file(context: &Context, passphrase: &str) -> Result<Strin
let msg_subj = context.stock_str(StockMessage::AcSetupMsgSubject); let msg_subj = context.stock_str(StockMessage::AcSetupMsgSubject);
let msg_body = context.stock_str(StockMessage::AcSetupMsgBody); let msg_body = context.stock_str(StockMessage::AcSetupMsgBody);
// let msg_body_head: &str = msg_body.split('\r').next().unwrap(); let msg_body_html = msg_body.replace("\r", "").replace("\n", "<br>");
// let msg_body_html = msg_body_head.replace("\n", "<br>");
let msg_body_html = msg_body.replace("\n", "<br>");
Ok(format!( Ok(format!(
concat!( concat!(
"<!DOCTYPE html>\r\n", "<!DOCTYPE html>\r\n",
@@ -1289,6 +1287,8 @@ mod tests {
use std::ffi::CStr; use std::ffi::CStr;
use num_traits::ToPrimitive;
use crate::config::Config; use crate::config::Config;
use crate::key; use crate::key;
use crate::test_utils::*; use crate::test_utils::*;
@@ -1441,6 +1441,28 @@ mod tests {
assert!(msg.contains("-----END PGP MESSAGE-----\n")); assert!(msg.contains("-----END PGP MESSAGE-----\n"));
} }
unsafe extern "C" fn ac_setup_msg_cb(
ctx: &Context,
evt: Event,
d1: uintptr_t,
d2: uintptr_t,
) -> uintptr_t {
if evt == Event::GET_STRING && d1 == StockMessage::AcSetupMsgBody.to_usize().unwrap() {
"hello\r\nthere".strdup() as usize
} else {
logging_cb(ctx, evt, d1, d2)
}
}
#[test]
fn test_render_setup_file_newline_replace() {
let t = test_context(Some(ac_setup_msg_cb));
create_alice_keypair(&t.ctx);
let msg = dc_render_setup_file(&t.ctx, "pw").unwrap();
println!("{}", &msg);
assert!(msg.contains("<p>hello<br>there</p>"));
}
#[test] #[test]
fn test_create_setup_code() { fn test_create_setup_code() {
let t = dummy_context(); let t = dummy_context();