Interact with polls through the TimelineController as well (creation still disabled on threaded timeline as it's not yet supported by the SDK)

ElementX/Sources/Services/Polls/PollInteractionHandler.swift

@@ -9,22 +9,22 @@ import Foundation
 
 class PollInteractionHandler: PollInteractionHandlerProtocol {
     let analyticsService: AnalyticsService
-    let roomProxy: JoinedRoomProxyProtocol
+    let timelineController: TimelineControllerProtocol
     
-    init(analyticsService: AnalyticsService, roomProxy: JoinedRoomProxyProtocol) {
+    init(analyticsService: AnalyticsService, timelineController: TimelineControllerProtocol) {
         self.analyticsService = analyticsService
-        self.roomProxy = roomProxy
+        self.timelineController = timelineController
     }
     
     func sendPollResponse(pollStartID: String, optionID: String) async -> Result<Void, Error> {
-        let sendPollResponseResult = await roomProxy.timeline.sendPollResponse(pollStartID: pollStartID, answers: [optionID])
+        let sendPollResponseResult = await timelineController.sendPollResponse(pollStartID: pollStartID, answers: [optionID])
         analyticsService.trackPollVote()
-
+        
         return sendPollResponseResult.mapError { $0 }
     }
     
     func endPoll(pollStartID: String) async -> Result<Void, Error> {
-        let endPollResult = await roomProxy.timeline.endPoll(pollStartID: pollStartID,
+        let endPollResult = await timelineController.endPoll(pollStartID: pollStartID,
                                                              text: "The poll with event id: \(pollStartID) has ended")
         analyticsService.trackPollEnd()
         return endPollResult.mapError { $0 }

ElementX/Sources/Services/Timeline/TimelineController/MockTimelineController.swift

@@ -244,6 +244,24 @@ class MockTimelineController: TimelineControllerProtocol {
         
         return .success(())
     }
+    
+    // MARK: - Polls
+    
+    func createPoll(question: String, answers: [String], pollKind: Poll.Kind) async -> Result<Void, TimelineControllerError> {
+        .success(())
+    }
+    
+    func editPoll(original eventID: String, question: String, answers: [String], pollKind: Poll.Kind) async -> Result<Void, TimelineControllerError> {
+        .success(())
+    }
+    
+    func sendPollResponse(pollStartID: String, answers: [String]) async -> Result<Void, TimelineControllerError> {
+        .success(())
+    }
+    
+    func endPoll(pollStartID: String, text: String) async -> Result<Void, TimelineControllerError> {
+        .success(())
+    }
         
     // MARK: - UI Test signalling
     

ElementX/Sources/Services/Timeline/TimelineController/TimelineController.swift

@@ -362,6 +362,24 @@ class TimelineController: TimelineControllerProtocol {
                                               waveform: waveform, requestHandle: requestHandle).mapError(TimelineControllerError.timelineProxyError)
     }
     
+    // MARK: - Polls
+    
+    func createPoll(question: String, answers: [String], pollKind: Poll.Kind) async -> Result<Void, TimelineControllerError> {
+        await activeTimeline.createPoll(question: question, answers: answers, pollKind: pollKind).mapError(TimelineControllerError.timelineProxyError)
+    }
+    
+    func editPoll(original eventID: String, question: String, answers: [String], pollKind: Poll.Kind) async -> Result<Void, TimelineControllerError> {
+        await activeTimeline.editPoll(original: eventID, question: question, answers: answers, pollKind: pollKind).mapError(TimelineControllerError.timelineProxyError)
+    }
+    
+    func sendPollResponse(pollStartID: String, answers: [String]) async -> Result<Void, TimelineControllerError> {
+        await activeTimeline.sendPollResponse(pollStartID: pollStartID, answers: answers).mapError(TimelineControllerError.timelineProxyError)
+    }
+    
+    func endPoll(pollStartID: String, text: String) async -> Result<Void, TimelineControllerError> {
+        await activeTimeline.endPoll(pollStartID: pollStartID, text: text).mapError(TimelineControllerError.timelineProxyError)
+    }
+    
     // MARK: - Private
     
     /// The cancellable used to update the timeline items.

ElementX/Sources/Services/Timeline/TimelineController/TimelineControllerProtocol.swift

@@ -131,4 +131,17 @@ protocol TimelineControllerProtocol {
                           audioInfo: AudioInfo,
                           waveform: [UInt16],
                           requestHandle: @MainActor (SendAttachmentJoinHandleProtocol) -> Void) async -> Result<Void, TimelineControllerError>
+    
+    // MARK: - Poll
+    
+    func createPoll(question: String, answers: [String], pollKind: Poll.Kind) async -> Result<Void, TimelineControllerError>
+    
+    func editPoll(original eventID: String,
+                  question: String,
+                  answers: [String],
+                  pollKind: Poll.Kind) async -> Result<Void, TimelineControllerError>
+    
+    func sendPollResponse(pollStartID: String, answers: [String]) async -> Result<Void, TimelineControllerError>
+    
+    func endPoll(pollStartID: String, text: String) async -> Result<Void, TimelineControllerError>
 }

ElementX/Sources/Services/Timeline/TimelineProxyProtocol.swift

@@ -131,10 +131,10 @@ protocol TimelineProxyProtocol {
                   answers: [String],
                   pollKind: Poll.Kind) async -> Result<Void, TimelineProxyError>
     
-    func endPoll(pollStartID: String, text: String) async -> Result<Void, TimelineProxyError>
-    
     func sendPollResponse(pollStartID: String, answers: [String]) async -> Result<Void, TimelineProxyError>
     
+    func endPoll(pollStartID: String, text: String) async -> Result<Void, TimelineProxyError>
+    
     func getLoadedReplyDetails(eventID: String) async -> Result<InReplyToDetails, TimelineProxyError>
     
     func buildMessageContentFor(_ message: String,