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

Apply requested changes

Browse Source
This commit is contained in:
jikstra
2019-08-11 16:57:49 +02:00
parent b7ff996b15
commit 3ba847ece2
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/dc_msg.rs
View File

@@ -472,17 +472,21 @@ pub fn dc_msg_load_from_db<'a>(msg: *mut dc_msg_t<'a>, context: &'a Context, id:
(*msg).type_0 = row.get(12)?; (*msg).type_0 = row.get(12)?;
(*msg).state = row.get(13)?; (*msg).state = row.get(13)?;
(*msg).is_dc_message = row.get(14)?; (*msg).is_dc_message = row.get(14)?;
(*msg).text = Some(if let rusqlite::types::ValueRef::Text(buf) = row.get_raw(15) {
let text;
if let rusqlite::types::ValueRef::Text(buf) = row.get_raw(15) {
if let Ok(t) = String::from_utf8(buf.to_vec()) { if let Ok(t) = String::from_utf8(buf.to_vec()) {
t text = t;
} else { } else {
warn!(context, 0, "dc_msg_load_from_db: could not get text column as non-lossy utf8 id {}", id); warn!(context, 0, "dc_msg_load_from_db: could not get text column as non-lossy utf8 id {}", id);
String::from_utf8_lossy(buf).into_owned() text = String::from_utf8_lossy(buf).into_owned();
} }
} else { } else {
warn!(context, 0, "dc_msg_load_from_db: could not get text column for id {}", id); warn!(context, 0, "dc_msg_load_from_db: could not get text column for id {}", id);
"[ Could not read from db ]".to_string() text = "[ Could not read from db ]".to_string();
}); }
(*msg).text = Some(text);
(*msg).param = row.get::<_, String>(16)?.parse().unwrap_or_default(); (*msg).param = row.get::<_, String>(16)?.parse().unwrap_or_default();
(*msg).starred = row.get(17)?; (*msg).starred = row.get(17)?;
(*msg).hidden = row.get(18)?; (*msg).hidden = row.get(18)?;
@@ -654,7 +658,6 @@ pub unsafe fn dc_get_msg<'a>(context: &'a Context, msg_id: uint32_t) -> *mut dc_
if success { if success {
obj obj
} else { } else {
println!("No success for {}", msg_id);
dc_msg_unref(obj); dc_msg_unref(obj);
0 as *mut dc_msg_t 0 as *mut dc_msg_t
} }