Merge branch 'charlag-fix-boosts'
This commit is contained in:
commit
3d074b10fb
1 changed files with 2 additions and 2 deletions
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue