chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Make polls respect content warning visibility setting (#1583)

Browse source 
* Make polls respect content warning visibility setting

* Only perform poll setup when poll is visible
This commit is contained in:
Levi Bard 2019-12-16 19:51:21 +01:00 • committed by Konrad Pozniak
commit bac3003182
2 changed files with 42 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java
View file

@ -108,14 +108,11 @@ public class ConversationViewHolder extends StatusBaseViewHolder {
setupButtons(listener, account.getId());
setSpoilerAndContent(status.getExpanded(), status.getContent(), status.getSpoilerText(), status.getMentions(), status.getEmojis(), listener);
setSpoilerAndContent(status.getExpanded(), status.getContent(), status.getSpoilerText(), status.getMentions(), status.getEmojis(), PollViewDataKt.toViewData(status.getPoll()), listener);
setConversationName(conversation.getAccounts());
setAvatars(conversation.getAccounts());
setupPoll(PollViewDataKt.toViewData(status.getPoll()), status.getEmojis(), listener);
}
private void setConversationName(List<ConversationAccountEntity> accounts) {