Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-08 18:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added bottom posting

Browse Source
This commit is contained in:
M66B
2020-11-20 14:35:07 +01:00
parent abccf43344
commit e446dcedad
3 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3358,6 +3358,7 @@ public class FragmentCompose extends FragmentBase {
boolean sign_default = prefs.getBoolean("sign_default", false);
boolean encrypt_default = prefs.getBoolean("encrypt_default", false);
boolean receipt_default = prefs.getBoolean("receipt_default", false);
boolean write_below = prefs.getBoolean("write_below", false);
Log.i("Load draft action=" + action + " id=" + id + " reference=" + reference);
@@ -3834,7 +3835,10 @@ public class FragmentCompose extends FragmentBase {
e.tagName(quote ? "blockquote" : "p");
reply.appendChild(e);
document.body().appendChild(reply);
if (write_below)
document.body().prependChild(reply);
else
document.body().appendChild(reply);
addSignature(context, document, data.draft, selected);
}
@@ -4003,7 +4007,10 @@ public class FragmentCompose extends FragmentBase {
Document document = HtmlHelper.sanitizeCompose(context, doc.html(), true);
for (Element e : ref)
document.body().appendChild(e);
if (write_below)
document.body().prependChild(e);
else
document.body().appendChild(e);
EntityIdentity identity = null;
if (data.draft.identity != null)
@@ -4451,12 +4458,16 @@ public class FragmentCompose extends FragmentBase {
// Get saved body
Document d;
boolean write_below = prefs.getBoolean("write_below", false);
if (extras != null && extras.containsKey("html")) {
// Save current revision
Document c = JsoupEx.parse(body);
for (Element e : ref)
c.body().appendChild(e);
if (write_below)
c.body().prependChild(e);
else
c.body().appendChild(e);
addSignature(context, c, draft, identity);
@@ -4467,7 +4478,10 @@ public class FragmentCompose extends FragmentBase {
d = HtmlHelper.sanitizeCompose(context, body, true);
for (Element e : ref)
d.body().appendChild(e);
if (write_below)
d.body().prependChild(e);
else
d.body().appendChild(e);
addSignature(context, d, draft, identity);
}
@@ -4977,6 +4991,7 @@ public class FragmentCompose extends FragmentBase {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int signature_location = prefs.getInt("signature_location", 1);
boolean usenet = prefs.getBoolean("usenet_signature", false);
boolean write_below = prefs.getBoolean("write_below", false);
Element div = document.createElement("div");
div.attr("fairemail", "signature");
@@ -4992,12 +5007,15 @@ public class FragmentCompose extends FragmentBase {
div.append(identity.signature);
Elements ref = document.select("div[fairemail=reference]");
if (signature_location == 0)
if (signature_location == 0) // top
document.body().prependChild(div);
else if (ref.size() == 0 || signature_location == 2)
else if (ref.size() == 0 || signature_location == 2) // bottom
document.body().appendChild(div);
else if (signature_location == 1)
ref.first().before(div);
else if (signature_location == 1) // between
if (write_below)
ref.last().after(div);
else
ref.first().before(div);
}
private void showDraft(final EntityMessage draft, final boolean scroll) {