diff --git a/app/src/main/java/app/fedilab/android/client/API.java b/app/src/main/java/app/fedilab/android/client/API.java index 90e5ff62f..ac934372a 100644 --- a/app/src/main/java/app/fedilab/android/client/API.java +++ b/app/src/main/java/app/fedilab/android/client/API.java @@ -518,6 +518,11 @@ public class API { poll.setExpired(resobj.getBoolean("expired")); poll.setMultiple(resobj.getBoolean("multiple")); poll.setVotes_count(resobj.getInt("votes_count")); + if( resobj.has("voters_count")){ + poll.setVoters_count(resobj.getInt("voters_count")); + }else{ + poll.setVoters_count(resobj.getInt("votes_count")); + } poll.setVoted(resobj.getBoolean("voted")); JSONArray options = resobj.getJSONArray("options"); List pollOptions = new ArrayList<>(); diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Poll.java b/app/src/main/java/app/fedilab/android/client/Entities/Poll.java index 52e9554f3..30aa38168 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/Poll.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/Poll.java @@ -40,6 +40,7 @@ public class Poll implements Parcelable { private boolean expired; private boolean multiple; private int votes_count; + private int voters_count; private boolean voted; private List optionsList; @@ -138,4 +139,12 @@ public class Poll implements Parcelable { dest.writeByte(this.voted ? (byte) 1 : (byte) 0); dest.writeTypedList(this.optionsList); } + + public int getVoters_count() { + return voters_count; + } + + public void setVoters_count(int voters_count) { + this.voters_count = voters_count; + } } diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java index 55151c4f7..00f3d1441 100644 --- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java @@ -627,7 +627,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On } }); holder.poll_container.setVisibility(View.VISIBLE); - holder.number_votes.setText(context.getResources().getQuantityString(R.plurals.number_of_vote, status.getPoll().getVotes_count(), status.getPoll().getVotes_count())); + holder.number_votes.setText(context.getResources().getQuantityString(R.plurals.number_of_voters, status.getPoll().getVoters_count(), status.getPoll().getVoters_count())); holder.remaining_time.setText(context.getString(R.string.poll_finish_at, Helper.dateToStringPoll(poll.getExpires_at()))); } else { holder.poll_container.setVisibility(View.GONE); diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index da8a0bd55..c898109cc 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -894,7 +894,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct } }); holder.poll_container.setVisibility(View.VISIBLE); - holder.number_votes.setText(context.getResources().getQuantityString(R.plurals.number_of_vote, poll.getVotes_count(), poll.getVotes_count())); + holder.number_votes.setText(context.getResources().getQuantityString(R.plurals.number_of_voters, poll.getVoters_count(), poll.getVoters_count())); holder.remaining_time.setText(context.getString(R.string.poll_finish_at, Helper.dateToStringPoll(poll.getExpires_at()))); } else { holder.poll_container.setVisibility(View.GONE); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 56c6d5fff..6d1287a42 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1032,6 +1032,10 @@ %d votes + + %d voter + %d voters + Single choice Multiple choices