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

fix: infinite loading screens when when fetching remote followers on some accounts

Browse Source
This commit is contained in:
LucasGGamerM
2023-04-19 16:58:55 -03:00
parent 29777c2513
commit 2c7df11e84
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View File

@@ -1151,9 +1151,9 @@ public class UiUtils {
domain = matcher.group(1); domain = matcher.group(1);
} }
if(domain == null){ // if(domain == null){
return; // return;
} // }
Pattern patternForQuery = Pattern.compile("https?:\\/\\/[^\\/]+\\/@(\\w+)"); Pattern patternForQuery = Pattern.compile("https?:\\/\\/[^\\/]+\\/@(\\w+)");
Matcher matcherForQuery = patternForQuery.matcher(query.getQuery()); Matcher matcherForQuery = patternForQuery.matcher(query.getQuery());
@@ -1163,8 +1163,13 @@ public class UiUtils {
trimmedQuery = matcherForQuery.group(1); trimmedQuery = matcherForQuery.group(1);
} }
if(trimmedQuery == null){ // if(trimmedQuery == null){
return; // return;
// }
if(query instanceof Account){
domain = ((Account) query).getDomain();
trimmedQuery = ((Account) query).username;
} }
String finalDomain = domain; String finalDomain = domain;