element-hq/element-ios/issues/5114 - Added support for unstable poll …

…prefixes.
matrix-org · Feb 11, 2022 · 50a0920 · 50a0920
1 parent 30602a2
commit 50a0920
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/MatrixSDK/JSONModels/MXEvent.h b/MatrixSDK/JSONModels/MXEvent.h
@@ -257,8 +257,12 @@ FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensiblePollAnswers;
 FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensiblePollAnswerId;
 FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensiblePollMaxSelections;
 FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensiblePollKind;
+
 FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensiblePollKindDisclosed;
+FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensiblePollKindDisclosedMSC3381;
+
 FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensiblePollKindUndisclosed;
+FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensiblePollKindUndisclosedMSC3381;
 
 // Location
 FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensibleLocation;

diff --git a/MatrixSDK/JSONModels/MXEvent.m b/MatrixSDK/JSONModels/MXEvent.m
@@ -166,7 +166,10 @@
 NSString *const kMXMessageContentKeyExtensiblePollAnswerId = @"id";
 NSString *const kMXMessageContentKeyExtensiblePollMaxSelections = @"max_selections";
 NSString *const kMXMessageContentKeyExtensiblePollKind = @"kind";
+
+NSString *const kMXMessageContentKeyExtensiblePollKindDisclosedMSC3381 = @"org.matrix.msc3381.poll.disclosed";
 NSString *const kMXMessageContentKeyExtensiblePollKindDisclosed = @"m.poll.disclosed";
+NSString *const kMXMessageContentKeyExtensiblePollKindUndisclosedMSC3381 = @"org.matrix.msc3381.poll.undisclosed";
 NSString *const kMXMessageContentKeyExtensiblePollKindUndisclosed = @"m.poll.undisclosed";
 
 // Location

diff --git a/MatrixSDK/Room/Polls/PollBuilder.swift b/MatrixSDK/Room/Polls/PollBuilder.swift
@@ -29,7 +29,15 @@ struct PollBuilder {
 
         poll.text = pollStartEventContent.question
         poll.maxAllowedSelections = max(1, pollStartEventContent.maxSelections.uintValue)
-        poll.kind = (pollStartEventContent.kind == kMXMessageContentKeyExtensiblePollKindUndisclosed ? .undisclosed : .disclosed)
+
+        switch pollStartEventContent.kind {
+        case kMXMessageContentKeyExtensiblePollKindUndisclosedMSC3381, kMXMessageContentKeyExtensiblePollKindUndisclosed:
+            poll.kind = .undisclosed
+        case kMXMessageContentKeyExtensiblePollKindDisclosedMSC3381, kMXMessageContentKeyExtensiblePollKindDisclosed:
+            poll.kind = .disclosed
+        default:
+            poll.kind = .undisclosed
+        }
 
         var answerOptionIdentifiers = [String]()
         poll.answerOptions = pollStartEventContent.answerOptions.prefix(Constants.maxAnswerOptionCount).map { answerOption in

diff --git a/changelog.d/5114.change b/changelog.d/5114.change
@@ -0,0 +1 @@
+Added support for unstable poll prefixes.