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

Merge branch 'feature/remote-followers'

Browse Source
This commit is contained in:
LucasGGamerM
2023-04-16 20:10:41 -03:00
parent 8a4231686b 32da4f8e09
commit ba997903b6
9 changed files with 121 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1127,7 +1127,20 @@ public class UiUtils {
return;
}
new GetSearchResults(query.getQuery(), type, false).setCallback(new Callback<>() {
Pattern patternForQuery = Pattern.compile("https?:\\/\\/[^\\/]+\\/@(\\w+)");
Matcher matcherForQuery = patternForQuery.matcher(query.getQuery());
String trimmedQuery = null;
if(matcherForQuery.find()){
trimmedQuery = matcherForQuery.group(1);
}
if(trimmedQuery == null){
return;
}
String finalDomain = domain;
new GetSearchResults(trimmedQuery, type, false).setCallback(new Callback<>() {
@Override
public void onSuccess(SearchResults results) {
Optional<T> result = extractResult.apply(results);
@@ -1144,7 +1157,7 @@ public class UiUtils {
}
})
.wrapProgress((Activity)context, R.string.loading, true,
d -> transformDialogForLookup(context, targetAccountID, null, d))
d -> transformDialogForLookup(context, targetAccountID, null, d, finalDomain))
.execNoAuth(domain);
}
@@ -1152,9 +1165,13 @@ public class UiUtils {
openURL(context, accountID, url, true);
}
private static void transformDialogForLookup(Context context, String accountID, @Nullable String url, ProgressDialog dialog) {
private static void transformDialogForLookup(Context context, String accountID, @Nullable String url, ProgressDialog dialog){
transformDialogForLookup(context, accountID, url, dialog, null);
}
private static void transformDialogForLookup(Context context, String accountID, @Nullable String url, ProgressDialog dialog, @Nullable String instanceName) {
if (accountID != null) {
dialog.setTitle(context.getString(R.string.sk_loading_resource_on_instance_title, getInstanceName(accountID)));
dialog.setTitle(context.getString(R.string.sk_loading_resource_on_instance_title, instanceName != null ? instanceName : getInstanceName(accountID)));
} else {
dialog.setTitle(R.string.sk_loading_fediverse_resource_title);
}