owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(LinkCard): generalize skipping redirect links

Browse Source
This commit is contained in:
FineFindus
2024-06-29 10:38:04 +02:00
parent dd4bed0027
commit 77c5173014
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
View File

@@ -146,18 +146,18 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
String url=item.status.card.url; String url=item.status.card.url;
// Mastodon.social sometimes adds an additional redirect page // Mastodon.social sometimes adds an additional redirect page
// this is really disruptive on mobile, especially since it breaks the loopUp/openURL functionality // this is really disruptive on mobile, especially since it breaks the loopUp/openURL functionality
if(url.startsWith("https://mastodon.social/redirect/statuses/")){ Uri parsedURL=Uri.parse(url);
Uri parsedURL=Uri.parse(url); if(parsedURL.getPath()!=null && parsedURL.getPath().startsWith("/redirect/statuses/")){
// find actually linked url in status content // find actually linked url in status content
Matcher matcher=HtmlParser.URL_PATTERN.matcher(item.status.content); Matcher matcher=HtmlParser.URL_PATTERN.matcher(item.status.content);
String foundURL; String foundURL;
while(matcher.find() && parsedURL.getLastPathSegment()!=null){ while(matcher.find()){
foundURL=matcher.group(3); foundURL=matcher.group(3);
if(TextUtils.isEmpty(matcher.group(4))) if(TextUtils.isEmpty(matcher.group(4)))
foundURL="http://"+foundURL; foundURL="http://"+foundURL;
// SAFETY: Cannot be null, as otherwise the matcher wouldn't find it // SAFETY: Cannot be null, as otherwise the matcher wouldn't find it
// also, group is marked as non-null // also, group is marked as non-null
assert foundURL!=null; assert foundURL!=null && parsedURL.getLastPathSegment()!=null;
if(foundURL.endsWith(parsedURL.getLastPathSegment())) { if(foundURL.endsWith(parsedURL.getLastPathSegment())) {
// found correct URL // found correct URL
url=foundURL; url=foundURL;