diff options
Diffstat (limited to 'Swift/Controllers/Chat/ChatController.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/ChatController.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp index 5f441f8..debd83f 100644 --- a/Swift/Controllers/Chat/ChatController.cpp +++ b/Swift/Controllers/Chat/ChatController.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2018 Isode Limited. | 2 | * Copyright (c) 2010-2019 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -190,7 +190,7 @@ void ChatController::preHandleIncomingMessage(std::shared_ptr<MessageEvent> mess | |||
| 190 | // handle XEP-0184 Message Receipts | 190 | // handle XEP-0184 Message Receipts |
| 191 | // incomming receipts | 191 | // incomming receipts |
| 192 | if (std::shared_ptr<DeliveryReceipt> receipt = message->getPayload<DeliveryReceipt>()) { | 192 | if (std::shared_ptr<DeliveryReceipt> receipt = message->getPayload<DeliveryReceipt>()) { |
| 193 | SWIFT_LOG(debug) << "received receipt for id: " << receipt->getReceivedID() << std::endl; | 193 | SWIFT_LOG(debug) << "received receipt for id: " << receipt->getReceivedID(); |
| 194 | if (requestedReceipts_.find(receipt->getReceivedID()) != requestedReceipts_.end()) { | 194 | if (requestedReceipts_.find(receipt->getReceivedID()) != requestedReceipts_.end()) { |
| 195 | chatWindow_->setMessageReceiptState(requestedReceipts_[receipt->getReceivedID()], ChatWindow::ReceiptReceived); | 195 | chatWindow_->setMessageReceiptState(requestedReceipts_[receipt->getReceivedID()], ChatWindow::ReceiptReceived); |
| 196 | requestedReceipts_.erase(receipt->getReceivedID()); | 196 | requestedReceipts_.erase(receipt->getReceivedID()); |
| @@ -407,7 +407,7 @@ void ChatController::handleWhiteboardStateChange(const ChatWindow::WhiteboardSes | |||
| 407 | } | 407 | } |
| 408 | 408 | ||
| 409 | void ChatController::handleFileTransferCancel(std::string id) { | 409 | void ChatController::handleFileTransferCancel(std::string id) { |
| 410 | SWIFT_LOG(debug) << "handleFileTransferCancel(" << id << ")" << std::endl; | 410 | SWIFT_LOG(debug) << "handleFileTransferCancel(" << id << ")"; |
| 411 | if (ftControllers.find(id) != ftControllers.end()) { | 411 | if (ftControllers.find(id) != ftControllers.end()) { |
| 412 | ftControllers[id]->cancel(); | 412 | ftControllers[id]->cancel(); |
| 413 | } else { | 413 | } else { |
| @@ -416,7 +416,7 @@ void ChatController::handleFileTransferCancel(std::string id) { | |||
| 416 | } | 416 | } |
| 417 | 417 | ||
| 418 | void ChatController::handleFileTransferStart(std::string id, std::string description) { | 418 | void ChatController::handleFileTransferStart(std::string id, std::string description) { |
| 419 | SWIFT_LOG(debug) << "handleFileTransferStart(" << id << ", " << description << ")" << std::endl; | 419 | SWIFT_LOG(debug) << "handleFileTransferStart(" << id << ", " << description << ")"; |
| 420 | if (ftControllers.find(id) != ftControllers.end()) { | 420 | if (ftControllers.find(id) != ftControllers.end()) { |
| 421 | ftControllers[id]->start(description); | 421 | ftControllers[id]->start(description); |
| 422 | } else { | 422 | } else { |
| @@ -425,7 +425,7 @@ void ChatController::handleFileTransferStart(std::string id, std::string descrip | |||
| 425 | } | 425 | } |
| 426 | 426 | ||
| 427 | void ChatController::handleFileTransferAccept(std::string id, std::string filename) { | 427 | void ChatController::handleFileTransferAccept(std::string id, std::string filename) { |
| 428 | SWIFT_LOG(debug) << "handleFileTransferAccept(" << id << ", " << filename << ")" << std::endl; | 428 | SWIFT_LOG(debug) << "handleFileTransferAccept(" << id << ", " << filename << ")"; |
| 429 | if (ftControllers.find(id) != ftControllers.end()) { | 429 | if (ftControllers.find(id) != ftControllers.end()) { |
| 430 | ftControllers[id]->accept(filename); | 430 | ftControllers[id]->accept(filename); |
| 431 | } else { | 431 | } else { |
| @@ -434,7 +434,7 @@ void ChatController::handleFileTransferAccept(std::string id, std::string filena | |||
| 434 | } | 434 | } |
| 435 | 435 | ||
| 436 | void ChatController::handleSendFileRequest(std::string filename) { | 436 | void ChatController::handleSendFileRequest(std::string filename) { |
| 437 | SWIFT_LOG(debug) << "ChatController::handleSendFileRequest(" << filename << ")" << std::endl; | 437 | SWIFT_LOG(debug) << "ChatController::handleSendFileRequest(" << filename << ")"; |
| 438 | eventStream_->send(std::make_shared<SendFileUIEvent>(getToJID(), filename)); | 438 | eventStream_->send(std::make_shared<SendFileUIEvent>(getToJID(), filename)); |
| 439 | } | 439 | } |
| 440 | 440 | ||
Swift