From a6ac68499cf0177fbffd82d8492c7aed5540eae4 Mon Sep 17 00:00:00 2001 From: sk Date: Sat, 27 May 2023 01:37:10 +0200 Subject: [PATCH] use url as fallback for remote url --- .../android/ui/displayitems/FileStatusDisplayItem.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java index dd33e03ad..50e720a02 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java @@ -44,7 +44,7 @@ public class FileStatusDisplayItem extends StatusDisplayItem{ @Override public void onBind(FileStatusDisplayItem item) { - Uri url = Uri.parse(item.attachment.remoteUrl); + Uri url = Uri.parse(getUrl()); title.setText(item.attachment.description != null ? item.attachment.description : url.getLastPathSegment()); @@ -53,7 +53,11 @@ public class FileStatusDisplayItem extends StatusDisplayItem{ } private void onClick(View v) { - UiUtils.openURL(itemView.getContext(), item.parentFragment.getAccountID(), item.attachment.remoteUrl); + UiUtils.openURL(itemView.getContext(), item.parentFragment.getAccountID(), getUrl()); + } + + private String getUrl() { + return item.attachment.remoteUrl == null ? item.attachment.url : item.attachment.remoteUrl; } } }