element-hq/element-ios/issues/5114 - Made user identifier mandatory, …

…defaulting maxSelections to 1 as per msc.
matrix-org · Nov 24, 2021 · 5c41239 · 5c41239
1 parent b8759d6
commit 5c41239
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/MatrixSDK/Room/Polls/PollAggregator.swift b/MatrixSDK/Room/Polls/PollAggregator.swift
@@ -70,7 +70,7 @@ public class PollAggregator {
 
         pollBuilder = PollBuilder()
 
-        poll = pollBuilder.build(pollStartEventContent: self.pollStartEventContent, events: self.events)
+        poll = pollBuilder.build(pollStartEventContent: self.pollStartEventContent, events: self.events, currentUserIdentifier: session.myUserId)
 
         reloadData()
 
@@ -103,10 +103,10 @@ public class PollAggregator {
 
                 self.events.append(event)
 
-                self.poll = self.pollBuilder.build(pollStartEventContent: self.pollStartEventContent, events: self.events)
+                self.poll = self.pollBuilder.build(pollStartEventContent: self.pollStartEventContent, events: self.events, currentUserIdentifier: self.session.myUserId)
             } as Any
 
-            self.poll = self.pollBuilder.build(pollStartEventContent: self.pollStartEventContent, events: self.events)
+            self.poll = self.pollBuilder.build(pollStartEventContent: self.pollStartEventContent, events: self.events, currentUserIdentifier: self.session.myUserId)
 
             self.delegate?.pollAggregatorDidEndLoading(self)
 

diff --git a/MatrixSDK/Room/Polls/PollBuilder.swift b/MatrixSDK/Room/Polls/PollBuilder.swift
@@ -17,12 +17,12 @@
 import Foundation
 
 struct PollBuilder {
-    func build(pollStartEventContent: MXEventContentPollStart, events: [MXEvent], currentUserIdentifer: String? = nil) -> PollProtocol {
+    func build(pollStartEventContent: MXEventContentPollStart, events: [MXEvent], currentUserIdentifier: String) -> PollProtocol {
 
         let poll = Poll()
 
         poll.text = pollStartEventContent.question
-        poll.maxAllowedSelections = pollStartEventContent.maxSelections.uintValue
+        poll.maxAllowedSelections = max(1, pollStartEventContent.maxSelections.uintValue)
         poll.kind = (pollStartEventContent.kind == kMXMessageContentKeyExtensiblePollKindUndisclosed ? .undisclosed : .disclosed)
 
         var answerOptionIdentifiers = [String]()
@@ -95,7 +95,7 @@ struct PollBuilder {
                 }
             }
 
-            if groupedUserAnswers.key == currentUserIdentifer {
+            if groupedUserAnswers.key == currentUserIdentifier {
                 currentUserAnswers = groupedUserAnswers.value
             }
 

diff --git a/MatrixSDKTests/MXPollBuilderTests.swift b/MatrixSDKTests/MXPollBuilderTests.swift
@@ -25,7 +25,7 @@ class MXPollBuilderTest: XCTestCase {
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Alice", answerIdentifiers: ["1"]))!)
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", answerIdentifiers: ["1"]))!)
 
-        let poll = builder.build(pollStartEventContent: pollStartEventContent(maxSelections: 7), events: events)
+        let poll = builder.build(pollStartEventContent: pollStartEventContent(maxSelections: 7), events: events, currentUserIdentifier: "")
         XCTAssertEqual(poll.maxAllowedSelections, 7)
         XCTAssertEqual(poll.text, "Question")
         XCTAssertEqual(poll.kind, .disclosed)
@@ -44,7 +44,7 @@ class MXPollBuilderTest: XCTestCase {
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", timestamp: 0, answerIdentifiers: ["1"]))!)
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", timestamp: 1, answerIdentifiers: []))!)
 
-        let poll = builder.build(pollStartEventContent: pollStartEventContent(), events: events)
+        let poll = builder.build(pollStartEventContent: pollStartEventContent(), events: events, currentUserIdentifier: "")
         XCTAssertEqual(poll.answerOptions.first?.count, 0)
         XCTAssertEqual(poll.answerOptions.last?.count, 0)
     }
@@ -54,7 +54,7 @@ class MXPollBuilderTest: XCTestCase {
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", timestamp: 0, answerIdentifiers: ["1"]))!)
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", timestamp: 1, answerIdentifiers: ["1", "2"]))!)
 
-        let poll = builder.build(pollStartEventContent: pollStartEventContent(), events: events)
+        let poll = builder.build(pollStartEventContent: pollStartEventContent(), events: events, currentUserIdentifier: "")
         XCTAssertEqual(poll.answerOptions.first?.count, 0)
         XCTAssertEqual(poll.answerOptions.last?.count, 0)
     }
@@ -64,7 +64,7 @@ class MXPollBuilderTest: XCTestCase {
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", timestamp: 0, answerIdentifiers: ["1"]))!)
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", timestamp: 1, answerIdentifiers: ["1", "2", "3"]))!)
 
-        let poll = builder.build(pollStartEventContent: pollStartEventContent(), events: events)
+        let poll = builder.build(pollStartEventContent: pollStartEventContent(), events: events, currentUserIdentifier: "")
         XCTAssertEqual(poll.answerOptions.first?.count, 0)
         XCTAssertEqual(poll.answerOptions.last?.count, 0)
     }
@@ -73,7 +73,7 @@ class MXPollBuilderTest: XCTestCase {
         var events = [MXEvent]()
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", answerIdentifiers: ["1", "1", "1"]))!)
 
-        let poll = builder.build(pollStartEventContent: pollStartEventContent(maxSelections: 100), events: events)
+        let poll = builder.build(pollStartEventContent: pollStartEventContent(maxSelections: 100), events: events, currentUserIdentifier: "")
         XCTAssertEqual(poll.answerOptions.first?.count, 1)
         XCTAssertEqual(poll.answerOptions.last?.count, 0)
     }
@@ -82,7 +82,7 @@ class MXPollBuilderTest: XCTestCase {
         var events = [MXEvent]()
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", answerIdentifiers: ["1", "1", "2", "1", "2", "2", "1", "2"]))!)
 
-        let poll = builder.build(pollStartEventContent: pollStartEventContent(maxSelections: 100), events: events)
+        let poll = builder.build(pollStartEventContent: pollStartEventContent(maxSelections: 100), events: events, currentUserIdentifier: "")
         XCTAssertEqual(poll.answerOptions.first?.count, 1)
         XCTAssertEqual(poll.answerOptions.last?.count, 1)
     }
@@ -95,7 +95,7 @@ class MXPollBuilderTest: XCTestCase {
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", timestamp: 1, answerIdentifiers: []))!) // Too few
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", timestamp: 3, answerIdentifiers: ["1", "2"]))!) // Too many
 
-        let poll = builder.build(pollStartEventContent: pollStartEventContent(), events: events)
+        let poll = builder.build(pollStartEventContent: pollStartEventContent(), events: events, currentUserIdentifier: "")
         XCTAssertEqual(poll.answerOptions.first?.count, 0)
         XCTAssertEqual(poll.answerOptions.last?.count, 1)
     }
@@ -111,7 +111,7 @@ class MXPollBuilderTest: XCTestCase {
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", timestamp: 10, answerIdentifiers: []))!)
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Alice", timestamp:10, answerIdentifiers: ["1", "2"]))!)
 
-        let poll = builder.build(pollStartEventContent: pollStartEventContent(maxSelections: 10), events: events)
+        let poll = builder.build(pollStartEventContent: pollStartEventContent(maxSelections: 10), events: events, currentUserIdentifier: "")
 
         XCTAssert(poll.isClosed)
 
@@ -126,7 +126,7 @@ class MXPollBuilderTest: XCTestCase {
         var events = [MXEvent]()
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", answerIdentifiers: ["1"]))!)
 
-        let poll = builder.build(pollStartEventContent: pollStartEventContent(maxSelections: 7), events: events, currentUserIdentifer: "Bob")
+        let poll = builder.build(pollStartEventContent: pollStartEventContent(maxSelections: 7), events: events, currentUserIdentifier: "Bob")
         XCTAssertEqual(poll.answerOptions.first?.isCurrentUserSelection, true)
         XCTAssertEqual(poll.answerOptions.last?.isCurrentUserSelection, false)
     }
@@ -136,7 +136,7 @@ class MXPollBuilderTest: XCTestCase {
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", timestamp: 0, answerIdentifiers: ["1"]))!)
         events.append(MXEvent(fromJSON: pollResponseEventWithSender("Bob", timestamp: 1, answerIdentifiers: ["2", "1"]))!)
 
-        let poll = builder.build(pollStartEventContent: pollStartEventContent(maxSelections: 7), events: events, currentUserIdentifer: "Bob")
+        let poll = builder.build(pollStartEventContent: pollStartEventContent(maxSelections: 7), events: events, currentUserIdentifier: "Bob")
         XCTAssertEqual(poll.answerOptions.first?.isCurrentUserSelection, true)
         XCTAssertEqual(poll.answerOptions.last?.isCurrentUserSelection, true)
     }

diff --git a/MatrixSDKTests/MXPollRelationTests.m b/MatrixSDKTests/MXPollRelationTests.m
@@ -93,7 +93,7 @@ - (void)testBobClosesPollWithOneAnswer
 // Make sure that's still the case.
 - (void)testNoPollRelationPagination
 {
-    NSUInteger totalAnswers = 5;
+    NSUInteger totalAnswers = 100;
 
     [self createScenarioForBob:^(MXSession *mxSession, MXRoom *room, XCTestExpectation *expectation, MXEvent *pollStartEvent, MXEventContentPollStart *pollStartContent) {
         dispatch_group_t dispatchGroup = dispatch_group_create();