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

use url as fallback for remote url

Browse Source
This commit is contained in:
sk
2023-05-27 01:37:10 +02:00
parent c10d7cfee4
commit a6ac68499c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
View File

@@ -44,7 +44,7 @@ public class FileStatusDisplayItem extends StatusDisplayItem{
@Override @Override
public void onBind(FileStatusDisplayItem item) { public void onBind(FileStatusDisplayItem item) {
Uri url = Uri.parse(item.attachment.remoteUrl); Uri url = Uri.parse(getUrl());
title.setText(item.attachment.description != null title.setText(item.attachment.description != null
? item.attachment.description ? item.attachment.description
: url.getLastPathSegment()); : url.getLastPathSegment());
@@ -53,7 +53,11 @@ public class FileStatusDisplayItem extends StatusDisplayItem{
} }
private void onClick(View v) { 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;
} }
} }
} }