Revision 8d76e2e3 ChatSecure/Classes/Controllers/XMPP/OTRXMPPManager.m

View differences:

ChatSecure/Classes/Controllers/XMPP/OTRXMPPManager.m
242 242
    _fileTransferManager = [[FileTransferManager alloc] initWithConnection:self.databaseConnection serverCapabilities:self.serverCapabilities sessionConfiguration:sessionConfiguration];
243 243
    
244 244
    // Message storage
245
    _messageStorage = [[MessageStorage alloc] initWithConnection:self.databaseConnection capabilities:self.xmppCapabilities dispatchQueue:nil];
245
    _messageStorage = [[MessageStorage alloc] initWithConnection:self.databaseConnection capabilities:self.xmppCapabilities fileTransfer:self.fileTransferManager dispatchQueue:nil];
246 246
    [self.messageStorage activate:self.xmppStream];
247 247
    
248 248
    //Stream Management
......
274 274
    
275 275
    //OMEMO
276 276
    if ([[OTRAppDelegate appDelegate].theme enableOMEMO]) {
277
        self.omemoSignalCoordinator = [[OTROMEMOSignalCoordinator alloc] initWithAccountYapKey:self.account.uniqueId databaseConnection:self.databaseConnection error:nil];
277
        self.omemoSignalCoordinator = [[OTROMEMOSignalCoordinator alloc] initWithAccountYapKey:self.account.uniqueId databaseConnection:self.databaseConnection messageStorage:self.messageStorage error:nil];
278 278
        _omemoModule = [[OMEMOModule alloc] initWithOMEMOStorage:self.omemoSignalCoordinator xmlNamespace:OMEMOModuleNamespaceConversationsLegacy];
279 279
        [self.omemoModule addDelegate:self.omemoSignalCoordinator delegateQueue:self.workQueue];
280 280
        [self.omemoModule activate:self.xmppStream];
......
880 880
    // Fetch latest vCard from server so we can update nickname
881 881
    //[self.xmppvCardTempModule fetchvCardTempForJID:self.JID ignoreStorage:YES];
882 882
    
883
    // Testing MAM
884
    [self.messageStorage.archiving retrieveMessageArchiveWithFields:nil withResultSet:nil];
883
    // [self.messageStorage.archiving retrieveMessageArchiveWithFields:nil withResultSet:nil];
885 884
}
886 885

  
887 886
- (void)xmppStream:(XMPPStream *)sender didNotAuthenticate:(NSXMLElement *)error

Also available in: Unified diff