Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bugfix-2' of https://github.com/connyduck/Tusky into connyduck-bugfix-2

This commit is contained in:
Vavassor 2017-04-21 01:17:42 -04:00
parent 70f8b6dc40 2e3d8b8cae
commit 2434c62d13
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
View File

@ -249,14 +249,23 @@ class StatusViewHolder extends RecyclerView.ViewHolder {
previews[i].setVisibility(View.VISIBLE); previews[i].setVisibility(View.VISIBLE);
if(previewUrl == null || previewUrl.isEmpty()) {
Picasso.with(context)
.load(mediaPreviewUnloadedId)
.into(previews[i]);
} else {
Picasso.with(context) Picasso.with(context)
.load(previewUrl) .load(previewUrl)
.placeholder(mediaPreviewUnloadedId) .placeholder(mediaPreviewUnloadedId)
.into(previews[i]); .into(previews[i]);
}
final String url = attachments[i].url; final String url = attachments[i].url;
final Status.MediaAttachment.Type type = attachments[i].type; final Status.MediaAttachment.Type type = attachments[i].type;
if(url == null || url.isEmpty()) {
previews[i].setOnClickListener(null);
} else {
previews[i].setOnClickListener(new View.OnClickListener() { previews[i].setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -265,6 +274,9 @@ class StatusViewHolder extends RecyclerView.ViewHolder {
}); });
} }
}
if (sensitive) { if (sensitive) {
sensitiveMediaWarning.setVisibility(View.VISIBLE); sensitiveMediaWarning.setVisibility(View.VISIBLE);
sensitiveMediaWarning.setOnClickListener(new View.OnClickListener() { sensitiveMediaWarning.setOnClickListener(new View.OnClickListener() {