Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-01 06:38:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reset unused cids, refactoring

Browse Source
This commit is contained in:
M66B
2019-01-06 10:15:06 +00:00
parent 53de71bccb
commit ae1a36b482
7 changed files with 88 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@@ -643,11 +643,11 @@ public class ServiceSynchronize extends LifecycleService {
if (message.content)
try {
String html = message.read(this);
String body = message.read(this);
StringBuilder sb = new StringBuilder();
if (!TextUtils.isEmpty(message.subject))
sb.append(message.subject).append("<br>");
sb.append(HtmlHelper.getPreview(html));
sb.append(HtmlHelper.getPreview(body));
mbuilder.setStyle(new Notification.BigTextStyle().bigText(Html.fromHtml(sb.toString())));
} catch (IOException ex) {
Log.e(ex);
@@ -1897,10 +1897,15 @@ public class ServiceSynchronize extends LifecycleService {
throw new MessageRemovedException();
MessageHelper helper = new MessageHelper((MimeMessage) imessage);
String html = helper.getHtml();
String preview = HtmlHelper.getPreview(html);
message.write(this, html);
String body = helper.getHtml();
String preview = HtmlHelper.getPreview(body);
message.write(this, body);
db.message().setMessageContent(message.id, true, preview);
List<String> cids = HtmlHelper.getCids(body);
for (EntityAttachment attachment : db.attachment().getAttachments(message.id))
if (attachment.cid != null && !cids.contains(attachment.cid))
db.attachment().clearCid(attachment.id);
}
private void doAttachment(EntityFolder folder, EntityOperation op, IMAPFolder ifolder, EntityMessage message, JSONArray jargs, DB db) throws JSONException, MessagingException, IOException {
@@ -2561,6 +2566,11 @@ public class ServiceSynchronize extends LifecycleService {
db.message().setMessageContent(
message.id, true, HtmlHelper.getPreview(body));
Log.i(folder.name + " downloaded message id=" + message.id + " size=" + message.size);
List<String> cids = HtmlHelper.getCids(body);
for (EntityAttachment attachment : attachments)
if (attachment.cid != null && !cids.contains(attachment.cid))
db.attachment().clearCid(attachment.id);
}
List<EntityAttachment> iattachments = null;