From 4077802949d5fb3383b2660df9540e66c265a72d Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 5 May 2019 17:26:30 +0200 Subject: [PATCH] Affect polls --- .../mastodon/drawers/StatusListAdapter.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index 044cb0657..edb66b50b 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -554,15 +554,13 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.multiple_choice.setVisibility(View.GONE); holder.single_choice.setVisibility(View.GONE); holder.submit_vote.setVisibility(View.GONE); - if( (status.getPoll() != null && status.getPoll().getOptionsList() != null) - || (status.getReblog() != null && status.getReblog().getPoll() != null && status.getReblog().getPoll().getOptionsList() != null) - ){ - Poll poll; - if( status.getReblog() != null) { - poll = status.getReblog().getPoll(); - }else { - poll = status.getPoll(); - } + Poll poll; + if( status.getReblog() != null) { + poll = status.getReblog().getPoll(); + }else { + poll = status.getPoll(); + } + if( poll != null && poll.getOptionsList() != null){ if( poll.isVoted() || poll.isExpired()){ holder.rated.setVisibility(View.VISIBLE); List items = new ArrayList<>();