Commit 51e031f0 authored by Thomas's avatar Thomas
Browse files

Fix quoted text

parent 0dead60a

app/src/main/java/app/fedilab/android/helper/Helper.java

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ public class Helper { 
    public static final Pattern wikipediaPattern = Pattern.compile("([\\w_-]+)\\.wikipedia.org/(((?!([\"'<])).)*)");

    public static final Pattern codePattern = Pattern.compile("code=([\\w-]+)");

    public static final Pattern nitterIDPattern = Pattern.compile("/status/(\\d+)");



    public static final Pattern emailPattern = Pattern.compile("(\\s+[\\w_.-]+@[a-zA-Z0-9][a-zA-Z0-9.-]{1,61}[a-zA-Z0-9](?:\\.[a-zA-Z]{2,})+)");

    public static final Pattern urlPattern = Pattern.compile(

            "(?i)\\b((?:[a-z][\\w-]+:(?:/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,10}/)(?:[^\\s()<>]+|\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\))+(?:\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?«»“”‘’]))",

app/src/main/java/app/fedilab/android/helper/SpannableHelper.java

+2 −4
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.text.TextPaint; 
import android.text.style.ClickableSpan;

import android.text.style.QuoteSpan;

import android.text.style.URLSpan;

import android.util.Patterns;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.Toast;
@@ -92,8 +91,7 @@ public class SpannableHelper { 
        if (text == null) {

            return null;

        }

        text = text.replaceAll("((<\\s?p\\s?>|<\\s?br\\s?/?>)&gt;(.*))<\\s?br\\s?/?>", "$2<blockquote>$3</blockquote><br>");

        text = text.replaceAll("((<\\s?br\\s?/?>)&gt;(.*))<\\s?/p\\s?/?>", "$2<blockquote>$3</blockquote></p>");

        text = text.replaceAll("((<\\s?p\\s?>|<\\s?br\\s?\\/?>)&gt;(((?!([<])).)*))", "$2<blockquote>$3</blockquote>");

        Pattern imgPattern = Pattern.compile("<img [^>]*src=\"([^\"]+)\"[^>]*>");

        Matcher matcherImg = imgPattern.matcher(text);

        HashMap<String, String> imagesToReplace = new LinkedHashMap<>();
@@ -672,7 +670,7 @@ public class SpannableHelper { 


    private static void emails(Context context, Spannable content) {

        // --- For all patterns defined in Helper class ---

        Pattern pattern = Patterns.EMAIL_ADDRESS;

        Pattern pattern = Helper.emailPattern;

        Matcher matcher = pattern.matcher(content);



        while (matcher.find()) {