Commit 393d2990 authored by Thomas's avatar Thomas
Browse files

Fix issue #403 - Freezes

parent fe104116

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

+5 −0
Original line number Diff line number Diff line
@@ -340,6 +340,11 @@ public class Helper { 


            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);



    public static final Pattern urlPatternSimple = Pattern.compile(

            "https?:\\/\\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)",



            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);



    public static final Pattern aLink = Pattern.compile("<a((?!href).)*href=\"([^\"]*)\"[^>]*(((?!</a).)*)</a>");

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

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

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package app.fedilab.android.helper; 
import static app.fedilab.android.BaseMainActivity.currentAccount;

import static app.fedilab.android.helper.Helper.USER_AGENT;

import static app.fedilab.android.helper.Helper.urlPattern;

import static app.fedilab.android.helper.Helper.urlPatternSimple;

import static app.fedilab.android.helper.ThemeHelper.linkColor;



import android.content.ClipData;
@@ -190,7 +191,7 @@ public class SpannableHelper { 


    private static void linkify(Context context, SpannableStringBuilder content, HashMap<String, String> urlDetails) {

        //--- URLs ----

        Matcher matcherLink = urlPattern.matcher(content);

        Matcher matcherLink = urlPatternSimple.matcher(content);



        int offSetTruncate = 0;