From 3fec39835c27c4a058086cbcd61737c0505bc34b Mon Sep 17 00:00:00 2001 From: FineFindus Date: Thu, 11 Jul 2024 20:43:15 +0200 Subject: [PATCH 1/2] refactor(UiUtils): remove unused function --- .../main/java/org/joinmastodon/android/ui/utils/UiUtils.java | 4 ---- 1 file changed, 4 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 4fdaf795b..76c2a9537 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 @@ -1341,10 +1341,6 @@ public class UiUtils { 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) { lookupURL(context, accountID, url, (clazz, args) -> { if (clazz == null) { From 8b26fb3184752c30cd5a3b35b7af51f7f8c4f846 Mon Sep 17 00:00:00 2001 From: FineFindus Date: Thu, 11 Jul 2024 20:43:50 +0200 Subject: [PATCH 2/2] fix(UiUtils): correctly lookup local account Fixes a regression in f590fde7a437ae17d1858bb24191bed04491fb79, where links to local accounts would be opened in the browser. --- .../main/java/org/joinmastodon/android/ui/utils/UiUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 76c2a9537..75561d464 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 @@ -1458,7 +1458,7 @@ public class UiUtils { return; } Optional account = results.accounts.stream() - .filter(a -> uri.getPath().contains(a.getFullyQualifiedName())).findAny(); + .filter(a -> uri.getPath().contains(a.username)).findAny(); if (account.isPresent()) { args.putParcelable("profileAccount", Parcels.wrap(account.get())); go.accept(ProfileFragment.class, args);