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

Merge pull request #459 from FineFindus/fix/lookup-local-account

Browse Source 
fix(UiUtils): correctly lookup local account
This commit is contained in:
LucasGGamerM
2024-07-13 11:58:33 -03:00
committed by GitHub
parent ffc2990b32 8b26fb3184
commit c01135d822
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1341,10 +1341,6 @@ public class UiUtils {
openURL(context, accountID, url, true); openURL(context, accountID, url, true);
} }
public static void openURL(Context context, String accountID, String url, Object parentObject) {
openURL(context, accountID, url, !(parentObject instanceof Status || parentObject instanceof Account));
}
public static void openURL(Context context, String accountID, String url, boolean launchBrowser) { public static void openURL(Context context, String accountID, String url, boolean launchBrowser) {
lookupURL(context, accountID, url, (clazz, args) -> { lookupURL(context, accountID, url, (clazz, args) -> {
if (clazz == null) { if (clazz == null) {
@@ -1462,7 +1458,7 @@ public class UiUtils {
return; return;
} }
Optional<Account> account = results.accounts.stream() Optional<Account> account = results.accounts.stream()
.filter(a -> uri.getPath().contains(a.getFullyQualifiedName())).findAny(); .filter(a -> uri.getPath().contains(a.username)).findAny();
if (account.isPresent()) { if (account.isPresent()) {
args.putParcelable("profileAccount", Parcels.wrap(account.get())); args.putParcelable("profileAccount", Parcels.wrap(account.get()));
go.accept(ProfileFragment.class, args); go.accept(ProfileFragment.class, args);