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

fix

Browse Source
This commit is contained in:
Sebastian Klähn
2021-10-06 15:06:58 +02:00
parent 04ca047370
commit 2d3ff61a44
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/dc_receive_imf.rs
View File

@@ -1076,7 +1076,7 @@ INSERT INTO msgs
?, ?, ?, ?, ?, ?, ?, ?,
?, ?, ?, ?, ?, ?, ?, ?,
?, ?, ?, ?, ?, ?, ?, ?,
?, ? ?, ?, ?
); );
"#, "#,
)?; )?;
@@ -1156,19 +1156,12 @@ INSERT INTO msgs
part.error.take().unwrap_or_default(), part.error.take().unwrap_or_default(),
ephemeral_timer, ephemeral_timer,
ephemeral_timestamp, ephemeral_timestamp,
<<<<<<< HEAD
<<<<<<< HEAD
if is_partial_download.is_some() { if is_partial_download.is_some() {
DownloadState::Available DownloadState::Available
} else { } else {
DownloadState::Done DownloadState::Done
}, },
=======
mime_parser.hop_info mime_parser.hop_info
>>>>>>> 4fa0edcf (add hop info)
=======
mime_parser.hop_info
>>>>>>> 3f8878fe7a756257dc6170712bc034d5b411ec3d
])?; ])?;
let row_id = conn.last_insert_rowid(); let row_id = conn.last_insert_rowid();

1
src/mimeparser.rs
View File

@@ -287,7 +287,6 @@ impl MimeMessage {
footer: None, footer: None,
is_mime_modified: false, is_mime_modified: false,
decoded_data: Vec::new(), decoded_data: Vec::new(),
hop_info: parse_receive_headers(&mail.get_headers()), hop_info: parse_receive_headers(&mail.get_headers()),
}; };