From 2c7df11e849ca6a37f9ea7ab68f8d525ecc66c48 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Wed, 19 Apr 2023 16:58:55 -0300 Subject: [PATCH] fix: infinite loading screens when when fetching remote followers on some accounts --- .../joinmastodon/android/ui/utils/UiUtils.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java index 0ed659b64..644250469 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java @@ -1151,9 +1151,9 @@ public class UiUtils { domain = matcher.group(1); } - if(domain == null){ - return; - } +// if(domain == null){ +// return; +// } Pattern patternForQuery = Pattern.compile("https?:\\/\\/[^\\/]+\\/@(\\w+)"); Matcher matcherForQuery = patternForQuery.matcher(query.getQuery()); @@ -1163,8 +1163,13 @@ public class UiUtils { trimmedQuery = matcherForQuery.group(1); } - if(trimmedQuery == null){ - return; +// if(trimmedQuery == null){ +// return; +// } + + if(query instanceof Account){ + domain = ((Account) query).getDomain(); + trimmedQuery = ((Account) query).username; } String finalDomain = domain;