From d31a9b1ade56fc6c0543d559d7c857ed23573b2d Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Wed, 15 Jun 2022 17:22:52 +0200 Subject: [PATCH] fix to send votes Signed-off-by: Marcel Hibbe --- app/src/main/java/com/nextcloud/talk/api/NcApi.java | 3 ++- .../java/com/nextcloud/talk/polls/ui/PollResultsFragment.kt | 2 +- app/src/main/res/layout/dialog_poll_vote.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApi.java b/app/src/main/java/com/nextcloud/talk/api/NcApi.java index 1a0fbd8ed..8b4689b99 100644 --- a/app/src/main/java/com/nextcloud/talk/api/NcApi.java +++ b/app/src/main/java/com/nextcloud/talk/api/NcApi.java @@ -536,10 +536,11 @@ public interface NcApi { Observable createPoll(@Header("Authorization") String authorization, @Url String url); + @FormUrlEncoded @POST Observable votePoll(@Header("Authorization") String authorization, @Url String url, - @Query("optionIds[]") List optionIds); + @Field("optionIds[]") List optionIds); @DELETE Observable closePoll(@Header("Authorization") String authorization, diff --git a/app/src/main/java/com/nextcloud/talk/polls/ui/PollResultsFragment.kt b/app/src/main/java/com/nextcloud/talk/polls/ui/PollResultsFragment.kt index 16da389ec..e17d59893 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/ui/PollResultsFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/ui/PollResultsFragment.kt @@ -115,7 +115,7 @@ class PollResultsFragment( val oneVoteInPercent = 100 / votersAmount poll.options?.forEachIndexed { index, option -> - val votersForThisOption = poll.votes?.filter { it.value == index }?.size!! + val votersForThisOption = poll.votes?.filter { it.key.toInt() == index }?.size!! val optionsPercent = oneVoteInPercent * votersForThisOption val pollResultItem = PollResultItem(option, optionsPercent) diff --git a/app/src/main/res/layout/dialog_poll_vote.xml b/app/src/main/res/layout/dialog_poll_vote.xml index 060e9ea1c..1e71b0244 100644 --- a/app/src/main/res/layout/dialog_poll_vote.xml +++ b/app/src/main/res/layout/dialog_poll_vote.xml @@ -30,7 +30,7 @@ android:layout_width="wrap_content" app:layout_constraintTop_toTopOf="parent" tools:layout_height="400dp" - tools:layout_width="match_parent"> + tools:layout_width="match_parent" />