mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Reduced memory usage

This commit is contained in:
M66B 2020-02-20 17:28:03 +01:00
parent 896fd1680f
commit c656520be1
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -817,8 +817,8 @@ public class FragmentCompose extends FragmentBase {
boolean plain = args.getBoolean("plain"); boolean plain = args.getBoolean("plain");
String body = args.getString("body"); String body = args.getString("body");
String rhtml = Helper.readText(EntityMessage.getFile(context, id)); File rfile = EntityMessage.getFile(context, id);
Document doc = JsoupEx.parse(rhtml); Document doc = JsoupEx.parse(rfile);
Elements ref = doc.select("div[fairemail=reference]"); Elements ref = doc.select("div[fairemail=reference]");
ref.removeAttr("fairemail"); ref.removeAttr("fairemail");
@ -3248,7 +3248,7 @@ public class FragmentCompose extends FragmentBase {
if (data.draft.content) { if (data.draft.content) {
File file = data.draft.getFile(context); File file = data.draft.getFile(context);
Document doc = JsoupEx.parse(Helper.readText(file)); Document doc = JsoupEx.parse(file);
doc.select("div[fairemail=signature]").remove(); doc.select("div[fairemail=signature]").remove();
Elements ref = doc.select("div[fairemail=reference]"); Elements ref = doc.select("div[fairemail=reference]");
ref.remove(); ref.remove();
@ -3270,7 +3270,7 @@ public class FragmentCompose extends FragmentBase {
addSignature(context, document, data.draft, identity); addSignature(context, document, data.draft, identity);
String html = JsoupEx.parse(document.html()).html(); String html = document.html();
Helper.writeText(file, html); Helper.writeText(file, html);
Helper.writeText(data.draft.getFile(context, data.draft.revision), html); Helper.writeText(data.draft.getFile(context, data.draft.revision), html);
@ -3648,8 +3648,7 @@ public class FragmentCompose extends FragmentBase {
db.message().updateMessage(draft); db.message().updateMessage(draft);
} }
String p = Helper.readText(draft.getFile(context)); Document doc = JsoupEx.parse(draft.getFile(context));
Document doc = JsoupEx.parse(p);
doc.select("div[fairemail=signature]").remove(); doc.select("div[fairemail=signature]").remove();
Elements ref = doc.select("div[fairemail=reference]"); Elements ref = doc.select("div[fairemail=reference]");
ref.remove(); ref.remove();
@ -3698,7 +3697,7 @@ public class FragmentCompose extends FragmentBase {
Helper.writeText(draft.getFile(context, draft.revision), body); Helper.writeText(draft.getFile(context, draft.revision), body);
} else } else
body = p; body = Helper.readText(draft.getFile(context));
if (action == R.id.action_undo || action == R.id.action_redo) { if (action == R.id.action_undo || action == R.id.action_redo) {
if (action == R.id.action_undo) { if (action == R.id.action_undo) {
@ -4058,7 +4057,7 @@ public class FragmentCompose extends FragmentBase {
if (draft == null || !draft.content) if (draft == null || !draft.content)
throw new IllegalArgumentException(context.getString(R.string.title_no_body)); throw new IllegalArgumentException(context.getString(R.string.title_no_body));
Document doc = JsoupEx.parse(Helper.readText(draft.getFile(context))); Document doc = JsoupEx.parse(draft.getFile(context));
doc.select("div[fairemail=signature]").remove(); doc.select("div[fairemail=signature]").remove();
Elements ref = doc.select("div[fairemail=reference]"); Elements ref = doc.select("div[fairemail=reference]");
ref.remove(); ref.remove();