forked from mirrors/Fedilab
some fixes
This commit is contained in:
parent
112701dd86
commit
818f32ffb5
1 changed files with 2 additions and 2 deletions
|
@ -124,7 +124,7 @@ public class SpannableHelper {
|
||||||
linkColor = -1;
|
linkColor = -1;
|
||||||
}
|
}
|
||||||
List<Mention> mentions = new ArrayList<>();
|
List<Mention> mentions = new ArrayList<>();
|
||||||
if (status != null) {
|
if (status != null && status.mentions != null) {
|
||||||
mentions.addAll(status.mentions);
|
mentions.addAll(status.mentions);
|
||||||
}
|
}
|
||||||
text = text.replaceAll("((<\\s?p\\s?>|<\\s?br\\s?/?>)>(((?!([<])).)*))", "$2<blockquote>$3</blockquote>");
|
text = text.replaceAll("((<\\s?p\\s?>|<\\s?br\\s?/?>)>(((?!([<])).)*))", "$2<blockquote>$3</blockquote>");
|
||||||
|
@ -437,7 +437,7 @@ public class SpannableHelper {
|
||||||
|
|
||||||
textView.setTag(CLICKABLE_SPAN);
|
textView.setTag(CLICKABLE_SPAN);
|
||||||
Pattern link = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(@[\\w._-]*[0-9]*)(/[0-9]+)?$");
|
Pattern link = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(@[\\w._-]*[0-9]*)(/[0-9]+)?$");
|
||||||
Matcher matcherLink = link.matcher(content);
|
Matcher matcherLink = link.matcher(finalUrl);
|
||||||
if (matcherLink.find() && !finalUrl.contains("medium.com")) {
|
if (matcherLink.find() && !finalUrl.contains("medium.com")) {
|
||||||
if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot
|
if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot
|
||||||
CrossActionHelper.fetchRemoteStatus(context, currentAccount, finalUrl, new CrossActionHelper.Callback() {
|
CrossActionHelper.fetchRemoteStatus(context, currentAccount, finalUrl, new CrossActionHelper.Callback() {
|
||||||
|
|
Loading…
Reference in a new issue