Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-12-08 08:55:19 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2016-12-09 08:15:44 (GMT) |
| commit | da7162b6e80ed6ce802bece3891fe85f30770c56 (patch) | |
| tree | 11cffaa17e475a0854b0726bdb4d4f126632dbe9 /Swift/Controllers/UIEvents/InviteToMUCUIEvent.h | |
| parent | c65a90e2a73814d09ad8c60adc4a259e90006db7 (diff) | |
| download | swift-da7162b6e80ed6ce802bece3891fe85f30770c56.zip swift-da7162b6e80ed6ce802bece3891fe85f30770c56.tar.bz2 | |
Fix issue with invites to MUC if a MUC PM for that room is open
Previously if you wanted to invite people to a MUC and had
a PM window for a MUC occupant open at the same time, the
InviteToMUCUIEvent would be handled by the PM window, by the
ChatController of the PM window and not the MUCController of
the MUC window.
Test-Information:
Verified that some scenarios work correctly:
- Tested a drop to a MUC window while a MUC PM window is open
to an occupant in the MUC. Previously this crashed due to
ChatsManager::localMUCServiceJID_ being empty.
- Test that impromptu MUC creation to a normal chat works.
- Test that impromptu MUC creation to a MUC PM chat works.
All unit and integration tests pass on macOS 10.12.1.
Change-Id: Ib20de7e925e3503308211936ee47d4ba829d0394
Diffstat (limited to 'Swift/Controllers/UIEvents/InviteToMUCUIEvent.h')
| -rw-r--r-- | Swift/Controllers/UIEvents/InviteToMUCUIEvent.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swift/Controllers/UIEvents/InviteToMUCUIEvent.h b/Swift/Controllers/UIEvents/InviteToMUCUIEvent.h index 414582d..e38eab8 100644 --- a/Swift/Controllers/UIEvents/InviteToMUCUIEvent.h +++ b/Swift/Controllers/UIEvents/InviteToMUCUIEvent.h @@ -1,47 +1,47 @@ /* * Copyright (c) 2013 Tobias Markmann * Licensed under the simplified BSD license. * See Documentation/Licenses/BSD-simplified.txt for more information. */ /* * Copyright (c) 2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> #include <vector> #include <Swiften/JID/JID.h> #include <Swift/Controllers/UIEvents/UIEvent.h> namespace Swift { class InviteToMUCUIEvent : public UIEvent { public: typedef std::shared_ptr<InviteToMUCUIEvent> ref; - InviteToMUCUIEvent(const JID& room, const std::vector<JID>& JIDsToInvite, const std::string& reason) : room_(room), invite_(JIDsToInvite), reason_(reason) { + InviteToMUCUIEvent(const JID& originator, const std::vector<JID>& JIDsToInvite, const std::string& reason) : originator_(originator), invite_(JIDsToInvite), reason_(reason) { } - const JID& getRoom() const { - return room_; + const JID& getOriginator() const { + return originator_; } const std::vector<JID> getInvites() const { return invite_; } const std::string getReason() const { return reason_; } private: - JID room_; + JID originator_; std::vector<JID> invite_; std::string reason_; }; } |