From 3b4be83ea7617cdc7862dff8fbd70d421f83e1a3 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 14 Jul 2022 15:32:25 +0200
Subject: [PATCH] calculate percent with voters instead votes

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../main/java/com/nextcloud/talk/polls/model/Poll.kt  |  3 +--
 .../talk/polls/repositories/PollRepositoryImpl.kt     | 11 +----------
 .../talk/polls/viewmodels/PollResultsViewModel.kt     |  2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/polls/model/Poll.kt b/app/src/main/java/com/nextcloud/talk/polls/model/Poll.kt
index 0405e8d2e..f96e0009e 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/model/Poll.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/model/Poll.kt
@@ -33,8 +33,7 @@ data class Poll(
     val maxVotes: Int,
     val votedSelf: List<Int>?,
     val numVoters: Int,
-    val details: List<PollDetails>?,
-    val totalVotes: Int
+    val details: List<PollDetails>?
 ) {
     companion object {
         const val STATUS_OPEN: Int = 0
diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt
index 7c888d0fd..76d627c31 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt
@@ -133,8 +133,7 @@ class PollRepositoryImpl(private val ncApi: NcApi, private val currentUserProvid
                 pollResponse.maxVotes,
                 pollResponse.votedSelf,
                 pollResponse.numVoters,
-                pollDetails,
-                getTotalVotes(pollResponse.votes)
+                pollDetails
             )
         }
 
@@ -154,13 +153,5 @@ class PollRepositoryImpl(private val ncApi: NcApi, private val currentUserProvid
                 pollDetailsResponse.optionId,
             )
         }
-
-        private fun getTotalVotes(votes: Map<String, Int>?): Int {
-            var totalVotes = 0
-            votes?.forEach {
-                totalVotes += it.value
-            }
-            return totalVotes
-        }
     }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt b/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt
index a803e628e..36c0353c8 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt
@@ -84,7 +84,7 @@ class PollResultsViewModel @Inject constructor() : ViewModel() {
     private fun initPollResults(poll: Poll) {
         _items.value = ArrayList()
 
-        val oneVoteInPercent = HUNDRED / poll.totalVotes
+        val oneVoteInPercent = HUNDRED / poll.numVoters
 
         poll.options?.forEachIndexed { index, option ->
             val votersAmountForThisOption = getVotersAmountForOption(poll, index)