Revision 8d76e2e3 ChatSecure/Classes/Controllers/MessageQueueHandler.swift

View differences:

ChatSecure/Classes/Controllers/MessageQueueHandler.swift
211 211 
    fileprivate func sendDirectMessage(_ message: OTROutgoingMessage,
212 212 
                                       buddy: OTRXMPPBuddy,
213 213 
                                       account: OTRAccount,
214 
                                       accountProtocol: OTRXMPPManager,
214 
                                       accountProtocol: XMPPManager,
215 215 
                                       messageSendingAction:OTRYapMessageSendAction,
216 216 
                                       completion:@escaping (_ success: Bool, _ retryTimeout: TimeInterval) -> Void) {
217 217 
        switch message.messageSecurity {
......
237 237 
    fileprivate func sendGroupMessage(_ message: OTRXMPPRoomMessage,
238 238 
                                      thread: OTRThreadOwner,
239 239 
                                      account: OTRAccount,
240 
                                      accountProtocol: OTRXMPPManager,
240 
                                      accountProtocol: XMPPManager,
241 241 
                                      messageSendingAction:OTRYapMessageSendAction,
242 242 
                                      completion:@escaping (_ success: Bool, _ retryTimeout: TimeInterval) -> Void) {
243 243 
        let roomManager = accountProtocol.roomManager
......
288 288 
        }
289 289
290 290 
        //Get the XMPP procol manager associated with this message and therefore account
291 
        guard let accountProtocol = OTRProtocolManager.sharedInstance().protocol(for: account) as? OTRXMPPManager else {
291 
        guard let accountProtocol = OTRProtocolManager.sharedInstance().protocol(for: account) as? XMPPManager else {
292 292 
            completion(true, 0.0)
293 293 
            return
294 294 
        }
......
342 342 
        }
343 343
344 344 
        //Get the XMPP procol manager associated with this message and therefore account
345 
        guard let accountProtocol = OTRProtocolManager.sharedInstance().protocol(for: account) as? OTRXMPPManager else {
345 
        guard let accountProtocol = OTRProtocolManager.sharedInstance().protocol(for: account) as? XMPPManager else {
346 346 
            completion(true, 0.0)
347 347 
            return
348 348 
        }
......
377 377 
        }
378 378
379 379 
        //Get the XMPP procol manager associated with this message and therefore account
380 
        guard let accountProtocol = OTRProtocolManager.sharedInstance().protocol(for: account) as? OTRXMPPManager else {
380 
        guard let accountProtocol = OTRProtocolManager.sharedInstance().protocol(for: account) as? XMPPManager else {
381 381 
            completion(true, 0.0)
382 382 
            return
383 383 
        }
......
560 560 
        }
561 561 
    }
562 562
563 
    func sendOMEMOMessage(message:OTROutgoingMessage, accountProtocol:OTRXMPPManager,completion:@escaping MessageQueueHandlerCompletion) {
563 
    func sendOMEMOMessage(message:OTROutgoingMessage, accountProtocol:XMPPManager,completion:@escaping MessageQueueHandlerCompletion) {
564 564 
        guard let text = message.text, text.count > 0 else {
565 565 
            completion(true, 0.0)
566 566 
            return

Also available in: Unified diff