Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 22:26:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Save signature, fixes

Browse Source
This commit is contained in:
M66B
2019-11-22 19:16:02 +01:00
parent 43f537f0cd
commit 29de070dec
5 changed files with 341 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -20,19 +20,14 @@ package eu.faircode.email;
*/
import android.content.Context;
import android.content.SharedPreferences;
import android.net.MailTo;
import android.net.Uri;
import android.text.TextUtils;
import androidx.preference.PreferenceManager;
import com.sun.mail.util.FolderClosedIOException;
import com.sun.mail.util.MessageRemovedIOException;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import java.io.BufferedReader;
import java.io.File;
@@ -322,28 +317,10 @@ public class MessageHelper {
// Build html body
Document document = JsoupEx.parse(Helper.readText(message.getFile(context)));
Elements ref = document.select("div[fairemail=reference]");
ref.remove();
ref.removeAttr("fairemail");
if (document.body() != null) {
// When sending message
if (identity != null && !TextUtils.isEmpty(identity.signature) && message.signature) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean usenet = prefs.getBoolean("usenet_signature", false);
if (usenet) {
// https://www.ietf.org/rfc/rfc3676.txt
Element span = document.createElement("span");
span.text("-- ");
span.appendElement("br");
document.body().appendChild(span);
}
document.body().append(identity.signature);
}
if (ref.size() > 0)
document.body().appendChild(ref.first());
}
// When sending message
if (identity != null)
document.select("div[fairemail=signature],div[fairemail=reference]").removeAttr("fairemail");
// multipart/mixed
// multipart/related