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

Fixed finding Usenet signature

This commit is contained in:
M66B 2019-08-22 20:31:40 +02:00
parent 6baac38747
commit 848496d3eb
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,6 +112,8 @@ import com.google.android.material.snackbar.Snackbar;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.nodes.Node;
import org.jsoup.nodes.TextNode;
import org.openintents.openpgp.OpenPgpError;
import org.openintents.openpgp.util.OpenPgpApi;
import org.openintents.openpgp.util.OpenPgpServiceConnection;
@ -2233,23 +2235,25 @@ public class FragmentCompose extends FragmentBase {
if (usenet) {
Document rdoc = Jsoup.parse(refText);
Element signature = null;
Node signature = null;
for (Element e : rdoc.select("*"))
if ("-- ".equals(e.wholeText()))
signature = e;
for (Node node : e.childNodes())
if (node instanceof TextNode &&
"--".equals(((TextNode) node).text().trim()))
signature = node;
if (signature != null) {
List<Element> tbd = new ArrayList<>();
List<Node> tbd = new ArrayList<>();
tbd.add(signature);
Element next = signature.nextElementSibling();
Node next = signature.nextSibling();
while (next != null) {
tbd.add(0, next);
next = next.nextElementSibling();
next = next.nextSibling();
}
for (Element e : tbd)
e.remove();
for (Node n : tbd)
n.remove();
if (rdoc.body() != null)
refText = rdoc.body().html();