element-hq/element-ios/issues/5114 - Added poll start even type enum …

…value, fixed poll question key path, made aggregator and models public.
matrix-org · Nov 19, 2021 · b8759d6 · b8759d6
1 parent 07db42d
commit b8759d6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/MatrixSDK/JSONModels/Event/Content/MXEventContentPollStart.m b/MatrixSDK/JSONModels/Event/Content/MXEventContentPollStart.m
@@ -39,7 +39,7 @@ + (instancetype)modelFromJSON:(NSDictionary *)JSONDictionary
     NSDictionary *content = JSONDictionary[kMXMessageContentKeyExtensiblePollStart];
 
     NSString *question, *kind;
-    MXJSONModelSetString(question, content[kMXMessageContentKeyExtensiblePollQuestion]);
+    MXJSONModelSetString(question, content[kMXMessageContentKeyExtensiblePollQuestion][kMXMessageContentKeyExtensibleText]);
     MXJSONModelSetString(kind, content[kMXMessageContentKeyExtensiblePollKind]);
 
     NSNumber *maxSelections;
@@ -57,7 +57,7 @@ - (NSDictionary *)JSONDictionary
 {
     NSMutableDictionary *content = [NSMutableDictionary dictionary];
 
-    content[kMXMessageContentKeyExtensiblePollQuestion] = self.question;
+    content[kMXMessageContentKeyExtensiblePollQuestion] = @{kMXMessageContentKeyExtensibleText: self.question};
     content[kMXMessageContentKeyExtensiblePollKind] = self.kind;
     content[kMXMessageContentKeyExtensiblePollMaxSelections] = self.maxSelections;
 

diff --git a/MatrixSDK/JSONModels/MXEvent.h b/MatrixSDK/JSONModels/MXEvent.h
@@ -91,6 +91,7 @@ typedef NS_ENUM(NSInteger, MXEventType)
     MXEventTypeSecretStorageDefaultKey,
     MXEventTypeTaggedEvents,
     MXEventTypeSpaceChild,
+    MXEventTypePollStart,
 
     // The event is a custom event. Refer to its `MXEventTypeString` version
     MXEventTypeCustom = 1000

diff --git a/MatrixSDK/Room/Polls/PollAggregator.swift b/MatrixSDK/Room/Polls/PollAggregator.swift
@@ -17,11 +17,11 @@
 import Foundation
 import Combine
 
-enum PollAggregatorError: Error {
+public enum PollAggregatorError: Error {
     case invalidPollStartEvent
 }
 
-protocol PollAggregatorDelegate: AnyObject {
+public protocol PollAggregatorDelegate: AnyObject {
     func pollAggregatorDidStartLoading(_ aggregator: PollAggregator)
     func pollAggregatorDidEndLoading(_ aggregator: PollAggregator)
     func pollAggregator(_ aggregator: PollAggregator, didFailWithError: Error)
@@ -34,7 +34,7 @@ protocol PollAggregatorDelegate: AnyObject {
  I will also listen for `mxRoomDidFlushData` and reload all data to avoid gappy sync problems
 */
 
-class PollAggregator {
+public class PollAggregator {
 
     private let session: MXSession
     private let room: MXRoom
@@ -45,19 +45,19 @@ class PollAggregator {
     private var eventListener: Any!
     private var events: [MXEvent] = []
 
-    private(set) var poll: PollProtocol! {
+    public private(set) var poll: PollProtocol! {
         didSet {
             delegate?.pollAggregatorDidUpdateData(self)
         }
     }
 
-    var delegate: PollAggregatorDelegate?
+    public var delegate: PollAggregatorDelegate?
 
     deinit {
         room.removeListener(eventListener)
     }
 
-    init(session: MXSession, room: MXRoom, pollStartEvent: MXEvent) throws {
+    public init(session: MXSession, room: MXRoom, pollStartEvent: MXEvent) throws {
         self.session = session
         self.room = room
         self.pollStartEvent = pollStartEvent

diff --git a/MatrixSDK/Room/Polls/PollModels.swift b/MatrixSDK/Room/Polls/PollModels.swift
@@ -16,25 +16,26 @@
 
 import Foundation
 
-enum PollKind {
+public enum PollKind {
     case disclosed
     case undisclosed
 }
 
-protocol PollAnswerOptionProtocol {
+public protocol PollAnswerOptionProtocol {
     var id: String { get }
     var text: String { get }
     var count: UInt { get }
     var isWinner: Bool { get }
     var isCurrentUserSelection: Bool { get }
 }
 
-protocol PollProtocol {
+public protocol PollProtocol {
     var text: String { get }
     var answerOptions: [PollAnswerOptionProtocol] { get }
     var kind: PollKind { get }
     var maxAllowedSelections: UInt { get }
     var isClosed: Bool { get }
+    var totalAnswerCount: UInt { get }
 }
 
 class PollAnswerOption: PollAnswerOptionProtocol {

diff --git a/MatrixSDK/Utils/MXTools.m b/MatrixSDK/Utils/MXTools.m
@@ -128,7 +128,8 @@ + (void)initialize
                                 kMXEventTypeStringSecretSend,
                                 kMXEventTypeStringSecretStorageDefaultKey,
                                 kMXEventTypeStringTaggedEvents,
-                                kMXEventTypeStringSpaceChild
+                                kMXEventTypeStringSpaceChild,
+                                kMXEventTypeStringPollStart,
                                 ];
 
         NSMutableDictionary *map = [NSMutableDictionary dictionaryWithCapacity:eventTypeMapEnumToString.count];