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

Merge branch 'charlag-fix-boosts'

This commit is contained in:
Vavassor 2017-07-16 19:42:05 -04:00
parent f4d627e815 b8fb2c903c
commit 3d074b10fb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/keylesspalace/tusky/util/ViewDataUtils.java
View File

@ -22,7 +22,7 @@ public final class ViewDataUtils {
Status visibleStatus = status.reblog == null ? status : status.reblog; Status visibleStatus = status.reblog == null ? status : status.reblog;
return new StatusViewData.Builder() return new StatusViewData.Builder()
.setId(status.id) .setId(status.id)
.setAttachments(status.attachments) .setAttachments(visibleStatus.attachments)
.setAvatar(visibleStatus.account.avatar) .setAvatar(visibleStatus.account.avatar)
.setContent(visibleStatus.content) .setContent(visibleStatus.content)
.setCreatedAt(visibleStatus.createdAt) .setCreatedAt(visibleStatus.createdAt)
@ -37,7 +37,7 @@ public final class ViewDataUtils {
.setSpoilerText(visibleStatus.spoilerText) .setSpoilerText(visibleStatus.spoilerText)
.setRebloggedByUsername(status.reblog == null ? null : status.account.username) .setRebloggedByUsername(status.reblog == null ? null : status.account.username)
.setUserFullName(visibleStatus.account.getDisplayName()) .setUserFullName(visibleStatus.account.getDisplayName())
.setSenderId(status.account.id) .setSenderId(visibleStatus.account.id)
.setRebloggingEnabled(visibleStatus.rebloggingAllowed()) .setRebloggingEnabled(visibleStatus.rebloggingAllowed())
.createStatusViewData(); .createStatusViewData();
} }