From d1ce15bf18ea4119ece633dc4b42cf08cc5a3316 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date: Thu, 12 Jan 2023 10:14:47 +0100
Subject: [PATCH] Renaming field in PollResponseData for better clarity

---
 .../room/detail/timeline/factory/PollItemViewStateFactory.kt  | 4 ++--
 .../room/detail/timeline/helper/PollResponseDataFactory.kt    | 2 +-
 .../home/room/detail/timeline/item/MessageInformationData.kt  | 2 +-
 .../detail/timeline/factory/PollItemViewStateFactoryTest.kt   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/PollItemViewStateFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/PollItemViewStateFactory.kt
index 28c560e161..7abc51fa51 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/PollItemViewStateFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/PollItemViewStateFactory.kt
@@ -83,7 +83,7 @@ class PollItemViewStateFactory @Inject constructor(
             totalVotes: Int,
             winnerVoteCount: Int?,
     ): PollViewState {
-        val totalVotesText = if (pollResponseSummary?.hasDecryptionError.orFalse()) {
+        val totalVotesText = if (pollResponseSummary?.hasEncryptedRelatedEvents.orFalse()) {
             stringProvider.getString(R.string.unable_to_decrypt_some_events_in_poll)
         } else {
             stringProvider.getQuantityString(R.plurals.poll_total_vote_count_after_ended, totalVotes, totalVotes)
@@ -131,7 +131,7 @@ class PollItemViewStateFactory @Inject constructor(
             pollResponseSummary: PollResponseData?,
             totalVotes: Int
     ): PollViewState {
-        val totalVotesText = if (pollResponseSummary?.hasDecryptionError.orFalse()) {
+        val totalVotesText = if (pollResponseSummary?.hasEncryptedRelatedEvents.orFalse()) {
             stringProvider.getString(R.string.unable_to_decrypt_some_events_in_poll)
         } else {
             stringProvider.getQuantityString(R.plurals.poll_total_vote_count_before_ended_and_voted, totalVotes, totalVotes)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/PollResponseDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/PollResponseDataFactory.kt
index 0ef60da6de..8f81adcd32 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/PollResponseDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/PollResponseDataFactory.kt
@@ -45,7 +45,7 @@ class PollResponseDataFactory @Inject constructor(
                     },
                     winnerVoteCount = it.aggregatedContent?.winnerVoteCount ?: 0,
                     totalVotes = it.aggregatedContent?.totalVotes ?: 0,
-                    hasDecryptionError = it.encryptedRelatedEventIds.isNotEmpty(),
+                    hasEncryptedRelatedEvents = it.encryptedRelatedEventIds.isNotEmpty(),
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
index 4bdfb948ce..a1a214785e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
@@ -91,7 +91,7 @@ data class PollResponseData(
         val totalVotes: Int = 0,
         val winnerVoteCount: Int = 0,
         val isClosed: Boolean = false,
-        val hasDecryptionError: Boolean = false,
+        val hasEncryptedRelatedEvents: Boolean = false,
 ) : Parcelable {
 
     fun getVoteSummaryOfAnOption(optionId: String) = votes?.get(optionId)
diff --git a/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/factory/PollItemViewStateFactoryTest.kt b/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/factory/PollItemViewStateFactoryTest.kt
index 4d14458e7f..8ee55d5b6e 100644
--- a/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/factory/PollItemViewStateFactoryTest.kt
+++ b/vector/src/test/java/im/vector/app/features/home/room/detail/timeline/factory/PollItemViewStateFactoryTest.kt
@@ -136,7 +136,7 @@ class PollItemViewStateFactoryTest {
         // Given
         val stringProvider = FakeStringProvider()
         val pollItemViewStateFactory = PollItemViewStateFactory(stringProvider.instance)
-        val closedPollSummary = A_POLL_RESPONSE_DATA.copy(isClosed = true, hasDecryptionError = true)
+        val closedPollSummary = A_POLL_RESPONSE_DATA.copy(isClosed = true, hasEncryptedRelatedEvents = true)
         val closedPollInformationData = A_MESSAGE_INFORMATION_DATA.copy(pollResponseAggregatedSummary = closedPollSummary)
 
         // When
@@ -220,7 +220,7 @@ class PollItemViewStateFactoryTest {
                 totalVotes = 1,
                 myVote = A_POLL_OPTION_IDS[0],
                 votes = mapOf(A_POLL_OPTION_IDS[0] to PollVoteSummaryData(total = 1, percentage = 1.0)),
-                hasDecryptionError = true,
+                hasEncryptedRelatedEvents = true,
         )
         val disclosedPollContent = A_POLL_CONTENT.copy(
                 unstablePollCreationInfo = A_POLL_CONTENT.getBestPollCreationInfo()?.copy(