Revision a4bb25f6 ChatSecure/Classes/Controllers/XMPP/OTRXMPPManager.m
| 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 = [[OTRXMPPMessageYapStorage alloc] initWithDatabaseConnection:self.databaseConnection];
|
|
| 245 |
_messageStorage = [[MessageStorage alloc] initWithConnection:self.databaseConnection capabilities:self.xmppCapabilities dispatchQueue:nil];
|
|
| 246 | 246 |
[self.messageStorage activate:self.xmppStream]; |
| 247 | 247 |
|
| 248 |
// Message Carbons |
|
| 249 |
_messageCarbons = [[XMPPMessageCarbons alloc] init]; |
|
| 250 |
[self.messageCarbons addDelegate:self.messageStorage delegateQueue:self.messageStorage.moduleDelegateQueue]; |
|
| 251 |
[self.messageCarbons activate:self.xmppStream]; |
|
| 252 |
|
|
| 253 |
// Message archiving |
|
| 254 |
_xmppMAM = [[XMPPMessageArchiveManagement alloc] init]; |
|
| 255 |
[self.xmppMAM addDelegate:self.messageStorage delegateQueue:self.messageStorage.moduleDelegateQueue]; |
|
| 256 |
[self.xmppMAM activate:self.xmppStream]; |
|
| 257 |
|
|
| 258 |
|
|
| 259 | 248 |
//Stream Management |
| 260 | 249 |
_streamManagementDelegate = [[OTRStreamManagementDelegate alloc] initWithDatabaseConnection:self.databaseConnection]; |
| 261 | 250 |
|
| ... | ... | |
| 269 | 258 |
[self.streamManagement activate:self.xmppStream]; |
| 270 | 259 |
|
| 271 | 260 |
//MUC |
| 272 |
_roomManager = [[OTRXMPPRoomManager alloc] init]; |
|
| 273 |
self.roomManager.databaseConnection = [OTRDatabaseManager sharedInstance].readWriteDatabaseConnection; |
|
| 261 |
_roomManager = [[OTRXMPPRoomManager alloc] initWithDatabaseConnection:[OTRDatabaseManager sharedInstance].readWriteDatabaseConnection capabilities:self.xmppCapabilities dispatchQueue:nil]; |
|
| 274 | 262 |
[self.roomManager activate:self.xmppStream]; |
| 275 | 263 |
|
| 276 | 264 |
//Buddy Manager (for deleting) |
| ... | ... | |
| 316 | 304 |
[_xmppvCardAvatarModule deactivate]; |
| 317 | 305 |
[_xmppCapabilities deactivate]; |
| 318 | 306 |
[_streamManagement deactivate]; |
| 319 |
[_messageCarbons deactivate]; |
|
| 320 | 307 |
[_messageStorage deactivate]; |
| 321 | 308 |
[_certificatePinningModule deactivate]; |
| 322 | 309 |
[_deliveryReceipts deactivate]; |
| ... | ... | |
| 894 | 881 |
//[self.xmppvCardTempModule fetchvCardTempForJID:self.JID ignoreStorage:YES]; |
| 895 | 882 |
|
| 896 | 883 |
// Testing MAM |
| 897 |
[self.xmppMAM retrieveMessageArchiveWithFields:nil withResultSet:nil];
|
|
| 884 |
[self.messageStorage.archiving retrieveMessageArchiveWithFields:nil withResultSet:nil];
|
|
| 898 | 885 |
} |
| 899 | 886 |
|
| 900 | 887 |
- (void)xmppStream:(XMPPStream *)sender didNotAuthenticate:(NSXMLElement *)error |
Also available in: Unified diff