From 080844dc9de121c80b15034ff77dd4109913b7f3 Mon Sep 17 00:00:00 2001 From: ericdecanini Date: Thu, 10 Mar 2022 16:28:22 +0100 Subject: [PATCH] Removes event timestamp condition for sdk poll voting --- .../session/room/EventRelationsAggregationProcessor.kt | 2 +- .../app/features/home/room/detail/timeline/item/PollItem.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt index 1e0eb8b497..d186f74a94 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt @@ -385,7 +385,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor( } val closedTime = existingPollSummary?.closedTime - if (closedTime != null && eventTimestamp > closedTime) { + if (closedTime != null) { Timber.v("## POLL is closed ignore event poll:$targetEventId, event :${event.eventId}") return } diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollItem.kt index 0ce225b21c..295f4c930b 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollItem.kt @@ -85,7 +85,8 @@ abstract class PollItem : AbsMessageItem() { } } - private fun isPollActive(optionViewState: PollOptionViewState) = optionViewState !is PollOptionViewState.PollEnded + private fun isPollActive(optionViewState: PollOptionViewState) = true // TODO: Revert (true for debugging) +// private fun isPollActive(optionViewState: PollOptionViewState) = optionViewState !is PollOptionViewState.PollEnded class Holder : AbsMessageItem.Holder(STUB_ID) { val questionTextView by bind(R.id.questionTextView)