compose: some more QuotedMessagePresenter refactorings

thunderbird · Apr 28, 2016 · b4b7a9f · b4b7a9f
1 parent 02cde7f
commit b4b7a9f
Show file tree

Hide file tree

Showing 2 changed files with 143 additions and 140 deletions.
diff --git a/k9mail/src/main/java/com/fsck/k9/helper/QuotedMessageHelper.java b/k9mail/src/main/java/com/fsck/k9/helper/QuotedMessageHelper.java
@@ -2,7 +2,9 @@
 
 
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -22,6 +24,10 @@
 import com.fsck.k9.mail.internet.MimeUtility;
 import com.fsck.k9.message.InsertableHtmlContent;
 import com.fsck.k9.message.SimpleMessageFormat;
+import org.htmlcleaner.CleanerProperties;
+import org.htmlcleaner.HtmlCleaner;
+import org.htmlcleaner.SimpleHtmlSerializer;
+import org.htmlcleaner.TagNode;
 
 
 public class QuotedMessageHelper {
@@ -35,6 +41,13 @@ public class QuotedMessageHelper {
     private static final Pattern FIND_INSERTION_POINT_BODY = Pattern.compile("(?si:.*?(<body(?:>|\\s+[^>]*>)).*)");
     private static final Pattern FIND_INSERTION_POINT_HTML_END = Pattern.compile("(?si:.*(</html>).*?)");
     private static final Pattern FIND_INSERTION_POINT_BODY_END = Pattern.compile("(?si:.*(</body>).*?)");
+
+    // Regexes to check for signature.
+    private static final Pattern DASH_SIGNATURE_HTML = Pattern.compile("(<br( /)?>|\r?\n)-- <br( /)?>", Pattern.CASE_INSENSITIVE);
+    private static final Pattern BLOCKQUOTE_START = Pattern.compile("<blockquote", Pattern.CASE_INSENSITIVE);
+    private static final Pattern BLOCKQUOTE_END = Pattern.compile("</blockquote>", Pattern.CASE_INSENSITIVE);
+    private static final Pattern DASH_SIGNATURE_PLAIN = Pattern.compile("\r\n-- \r\n.*", Pattern.DOTALL);
+
     // The first group in a Matcher contains the first capture group. We capture the tag found in the above REs so that
     // we can locate the *end* of that tag.
     private static final int FIND_INSERTION_POINT_FIRST_GROUP = 1;
@@ -365,4 +378,78 @@ public static String getBodyTextFromMessage(Part messagePart, SimpleMessageForma
         // If we had nothing interesting, return an empty string.
         return "";
     }
+
+    public static String stripSignatureForHtmlMessage(String content) {
+        Matcher dashSignatureHtml = DASH_SIGNATURE_HTML.matcher(content);
+        if (dashSignatureHtml.find()) {
+            Matcher blockquoteStart = BLOCKQUOTE_START.matcher(content);
+            Matcher blockquoteEnd = BLOCKQUOTE_END.matcher(content);
+            List<Integer> start = new ArrayList<>();
+            List<Integer> end = new ArrayList<>();
+
+            while (blockquoteStart.find()) {
+                start.add(blockquoteStart.start());
+            }
+            while (blockquoteEnd.find()) {
+                end.add(blockquoteEnd.start());
+            }
+            if (start.size() != end.size()) {
+                Log.d(K9.LOG_TAG, "There are " + start.size() + " <blockquote> tags, but " +
+                        end.size() + " </blockquote> tags. Refusing to strip.");
+            } else if (start.size() > 0) {
+                // Ignore quoted signatures in blockquotes.
+                dashSignatureHtml.region(0, start.get(0));
+                if (dashSignatureHtml.find()) {
+                    // before first <blockquote>.
+                    content = content.substring(0, dashSignatureHtml.start());
+                } else {
+                    for (int i = 0; i < start.size() - 1; i++) {
+                        // within blockquotes.
+                        if (end.get(i) < start.get(i + 1)) {
+                            dashSignatureHtml.region(end.get(i), start.get(i + 1));
+                            if (dashSignatureHtml.find()) {
+                                content = content.substring(0, dashSignatureHtml.start());
+                                break;
+                            }
+                        }
+                    }
+                    if (end.get(end.size() - 1) < content.length()) {
+                        // after last </blockquote>.
+                        dashSignatureHtml.region(end.get(end.size() - 1), content.length());
+                        if (dashSignatureHtml.find()) {
+                            content = content.substring(0, dashSignatureHtml.start());
+                        }
+                    }
+                }
+            } else {
+                // No blockquotes found.
+                content = content.substring(0, dashSignatureHtml.start());
+            }
+        }
+
+        // Fix the stripping off of closing tags if a signature was stripped,
+        // as well as clean up the HTML of the quoted message.
+        HtmlCleaner cleaner = new HtmlCleaner();
+        CleanerProperties properties = cleaner.getProperties();
+
+        // see http://htmlcleaner.sourceforge.net/parameters.php for descriptions
+        properties.setNamespacesAware(false);
+        properties.setAdvancedXmlEscape(false);
+        properties.setOmitXmlDeclaration(true);
+        properties.setOmitDoctypeDeclaration(false);
+        properties.setTranslateSpecialEntities(false);
+        properties.setRecognizeUnicodeChars(false);
+
+        TagNode node = cleaner.clean(content);
+        SimpleHtmlSerializer htmlSerialized = new SimpleHtmlSerializer(properties);
+        content = htmlSerialized.getAsString(node, "UTF8");
+        return content;
+    }
+
+    public static String stripSignatureForTextMessage(String content) {
+        if (DASH_SIGNATURE_PLAIN.matcher(content).find()) {
+            content = DASH_SIGNATURE_PLAIN.matcher(content).replaceFirst("\r\n");
+        }
+        return content;
+    }
 }