summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-02-15 16:34:10 (GMT)
committerTobias Markmann <tm@ayena.de>2016-02-15 16:34:24 (GMT)
commit21c5075cdeec10cb5334167a5687ee533fea23b1 (patch)
tree8b1f0e03ca1a7e57e5bc05e0f325a9ef5687b81b /Swift/Controllers/Chat/ChatController.cpp
parent36c70097b1a42af84f9d6bf48a0c6196c560cbe0 (diff)
downloadswift-21c5075cdeec10cb5334167a5687ee533fea23b1.zip
swift-21c5075cdeec10cb5334167a5687ee533fea23b1.tar.bz2
Disable file-transfers to MUC PM contactsswift-3.0rc3
Currently the file-transfers to MUC PM contacts fail because the from JID does not match the initiator JID. The initiator JID is always the real client JID at the moment. Disabling file-transfer for MUC PM contacts provides a better UX for now. Test-Information: Tested file-transfer to normal contacts still works. Tested file-transfers to MUC PMs do not start. Change-Id: If5f59eb313a25ca919393f497a57fd339eb17e3e
Diffstat (limited to 'Swift/Controllers/Chat/ChatController.cpp')
-rw-r--r--Swift/Controllers/Chat/ChatController.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp
index 6e540eb..a80eee5 100644
--- a/Swift/Controllers/Chat/ChatController.cpp
+++ b/Swift/Controllers/Chat/ChatController.cpp
@@ -128,7 +128,7 @@ void ChatController::handleBareJIDCapsChanged(const JID& /*jid*/) {
FeatureOracle featureOracle(entityCapsProvider_, presenceOracle_);
chatWindow_->setCorrectionEnabled(featureOracle.isMessageCorrectionSupported(toJID_));
- chatWindow_->setFileTransferEnabled(featureOracle.isFileTransferSupported(toJID_));
+ chatWindow_->setFileTransferEnabled(isInMUC_ ? No : featureOracle.isFileTransferSupported(toJID_));
contactSupportsReceipts_ = featureOracle.isMessageReceiptsSupported(toJID_);
checkForDisplayingDisplayReceiptsAlert();