diff --git a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java index 968d786a3..ce56efb54 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java @@ -65,7 +65,7 @@ public class ExternalShareActivity extends FragmentStackActivity{ .>map(handle -> UiUtils.lookupAccountHandle(this, accountId, handle, callback)) .or(() -> - UiUtils.lookupURL(this, accountId, text.get(), false, callback)) + UiUtils.lookupURL(this, accountId, text.get(), callback)) .ifPresent(req -> req.wrapProgress(this, R.string.loading, true, d -> { UiUtils.transformDialogForLookup(this, accountId, isFediUrl ? text.get() : null, d); 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 0c9dd3fa2..385476a27 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 @@ -1127,7 +1127,7 @@ public class UiUtils { } public static void openURL(Context context, String accountID, String url, boolean launchBrowser) { - lookupURL(context, accountID, url, launchBrowser, (clazz, args) -> { + lookupURL(context, accountID, url, (clazz, args) -> { if (clazz == null) { if (args != null && args.containsKey("error")) Toast.makeText(context, args.getString("error"), Toast.LENGTH_SHORT).show(); if (launchBrowser) launchWebBrowser(context, url); @@ -1192,7 +1192,7 @@ public class UiUtils { }).exec(accountID); } - public static Optional> lookupURL(Context context, String accountID, String url, boolean launchBrowser, BiConsumer, Bundle> go) { + public static Optional> lookupURL(Context context, String accountID, String url, BiConsumer, Bundle> go) { Uri uri = Uri.parse(url); List path = uri.getPathSegments(); if (accountID != null && "https".equals(uri.getScheme())) { @@ -1232,7 +1232,6 @@ public class UiUtils { go.accept(ProfileFragment.class, args); return; } - if (launchBrowser) launchWebBrowser(context, url); go.accept(null, bundleError(context.getString(R.string.sk_resource_not_found))); }