msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Download content outside of transaction

Browse Source
pull/152/head
M66B 6 years ago
parent 208db65caa
commit 3e15a0594c
8 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -1477,7 +1477,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
body = Helper.readText(EntityMessage.getFile(context, message.id));
} catch (IOException ex) {
Log.e(ex);
db.message().setMessageContent(message.id, false, null);
db.message().setMessageContent(message.id, false, null, null);
return null;
}

12
app/src/main/java/eu/faircode/email/Core.java
Unescape View File

@ -629,10 +629,9 @@ class Core {
MessageHelper helper = new MessageHelper((MimeMessage) imessage);
MessageHelper.MessageParts parts = helper.getMessageParts();
String body = parts.getHtml(context);
String preview = HtmlHelper.getPreview(body);
Helper.writeText(EntityMessage.getFile(context, message.id), body);
db.message().setMessageContent(message.id, true, preview);
db.message().setMessageWarning(message.id, parts.getWarnings(message.warning));
db.message().setMessageContent(message.id, true,
HtmlHelper.getPreview(body), parts.getWarnings(message.warning));
}
private static void onAttachment(Context context, JSONArray jargs, EntityFolder folder, EntityMessage message, EntityOperation op, IMAPFolder ifolder) throws JSONException, MessagingException, IOException {
@ -1001,13 +1000,11 @@ class Core {
for (int j = isub.length - 1; j >= 0 && state.running(); j--)
try {
db.beginTransaction();
if (ids[from + j] != null)
downloadMessage(
context,
folder, ifolder,
(IMAPMessage) isub[j], ids[from + j]);
db.setTransactionSuccessful();
} catch (FolderClosedException ex) {
throw ex;
} catch (FolderClosedIOException ex) {
@ -1015,7 +1012,6 @@ class Core {
} catch (Throwable ex) {
Log.e(folder.name, ex);
} finally {
db.endTransaction();
// Free memory
((IMAPMessage) isub[j]).invalidateHeaders();
}
@ -1379,8 +1375,8 @@ class Core {
if (!metered || (message.size != null && message.size < maxSize)) {
String body = parts.getHtml(context);
Helper.writeText(EntityMessage.getFile(context, message.id), body);
db.message().setMessageContent(message.id, true, HtmlHelper.getPreview(body));
db.message().setMessageWarning(message.id, parts.getWarnings(message.warning));
db.message().setMessageContent(message.id, true,
HtmlHelper.getPreview(body), parts.getWarnings(message.warning));
Log.i(folder.name + " downloaded message id=" + message.id + " size=" + message.size);
}
}

7
app/src/main/java/eu/faircode/email/DaoMessage.java
Unescape View File

@ -304,14 +304,11 @@ public interface DaoMessage {
@Query("UPDATE message SET sent = :sent WHERE id = :id")
int setMessageSent(long id, Long sent);
@Query("UPDATE message SET warning = :warning WHERE id = :id")
int setMessageWarning(long id, String warning);
@Query("UPDATE message SET error = :error WHERE id = :id")
int setMessageError(long id, String error);
@Query("UPDATE message SET content = :content, preview = :preview WHERE id = :id")
int setMessageContent(long id, boolean content, String preview);
@Query("UPDATE message SET content = :content, preview = :preview, warning = :warning WHERE id = :id")
int setMessageContent(long id, boolean content, String preview, String warning);
@Query("UPDATE message SET headers = :headers WHERE id = :id")
int setMessageHeaders(long id, String headers);

2
app/src/main/java/eu/faircode/email/EntityOperation.java
Unescape View File

@ -165,7 +165,7 @@ public class EntityOperation {
EntityMessage.getFile(context, newid));
} catch (IOException ex) {
Log.e(ex);
db.message().setMessageContent(newid, false, null);
db.message().setMessageContent(newid, false, null, null);
}
EntityAttachment.copy(context, db, message.id, newid);

2
app/src/main/java/eu/faircode/email/EntityRule.java
Unescape View File

@ -221,7 +221,7 @@ public class EntityRule {
reply.received = new Date().getTime();
reply.id = db.message().insertMessage(reply);
Helper.writeText(EntityMessage.getFile(context, reply.id), body);
db.message().setMessageContent(reply.id, true, HtmlHelper.getPreview(body));
db.message().setMessageContent(reply.id, true, HtmlHelper.getPreview(body), null);
EntityOperation.queue(context, db, reply, EntityOperation.SEND);
}

4
app/src/main/java/eu/faircode/email/FragmentCompose.java
Unescape View File

@ -1671,7 +1671,7 @@ public class FragmentCompose extends FragmentBase {
draft.id = db.message().insertMessage(draft);
Helper.writeText(EntityMessage.getFile(context, draft.id), body);
db.message().setMessageContent(draft.id, true, HtmlHelper.getPreview(body));
db.message().setMessageContent(draft.id, true, HtmlHelper.getPreview(body), null);
// Write reference text
if (ref != null && ref.content) {
@ -2020,7 +2020,7 @@ public class FragmentCompose extends FragmentBase {
draft.received = new Date().getTime();
db.message().updateMessage(draft);
Helper.writeText(EntityMessage.getFile(context, draft.id), body);
db.message().setMessageContent(draft.id, true, HtmlHelper.getPreview(body));
db.message().setMessageContent(draft.id, true, HtmlHelper.getPreview(body), null);
}
// Remove unused inline images

2
app/src/main/java/eu/faircode/email/Helper.java
Unescape View File

@ -412,7 +412,7 @@ public class Helper {
draft.received = new Date().getTime();
draft.id = db.message().insertMessage(draft);
writeText(EntityMessage.getFile(context, draft.id), body);
db.message().setMessageContent(draft.id, true, HtmlHelper.getPreview(body));
db.message().setMessageContent(draft.id, true, HtmlHelper.getPreview(body), null);
attachSettings(context, draft.id, 1);
attachNetworkInfo(context, draft.id, 2);

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

@ -435,15 +435,9 @@ public class ServiceSynchronize extends LifecycleService {
}
if (db.folder().getFolderDownload(folder.id))
try {
db.beginTransaction();
Core.downloadMessage(ServiceSynchronize.this,
folder, (IMAPFolder) ifolder,
(IMAPMessage) imessage, message.id);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
Core.downloadMessage(ServiceSynchronize.this,
folder, (IMAPFolder) ifolder,
(IMAPMessage) imessage, message.id);
} catch (MessageRemovedException ex) {
Log.w(folder.name, ex);
} catch (FolderClosedException ex) {
@ -524,15 +518,9 @@ public class ServiceSynchronize extends LifecycleService {
}
if (db.folder().getFolderDownload(folder.id))
try {
db.beginTransaction();
Core.downloadMessage(ServiceSynchronize.this,
folder, (IMAPFolder) ifolder,
(IMAPMessage) e.getMessage(), message.id);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
Core.downloadMessage(ServiceSynchronize.this,
folder, (IMAPFolder) ifolder,
(IMAPMessage) e.getMessage(), message.id);
} catch (MessageRemovedException ex) {
Log.w(folder.name, ex);
} catch (FolderClosedException ex) {

Write Preview
Loading…
Cancel
Save