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 | |
| 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')
| -rw-r--r-- | Swift/Controllers/UIEvents/InviteToMUCUIEvent.h | 8 | ||||
| -rw-r--r-- | Swift/Controllers/UIEvents/RequestInviteToMUCUIEvent.h | 18 |
2 files changed, 18 insertions, 8 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 @@ -24,11 +24,11 @@ namespace Swift { 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 { @@ -40,7 +40,7 @@ namespace Swift { } private: - JID room_; + JID originator_; std::vector<JID> invite_; std::string reason_; }; diff --git a/Swift/Controllers/UIEvents/RequestInviteToMUCUIEvent.h b/Swift/Controllers/UIEvents/RequestInviteToMUCUIEvent.h index dac499f..a8e4bb7 100644 --- a/Swift/Controllers/UIEvents/RequestInviteToMUCUIEvent.h +++ b/Swift/Controllers/UIEvents/RequestInviteToMUCUIEvent.h @@ -29,12 +29,22 @@ namespace Swift { NotImpromptu }; - RequestInviteToMUCUIEvent(const JID& room, const std::vector<JID>& JIDsToInvite, ImpromptuMode impromptu) : room_(room), invite_(JIDsToInvite) { + /** + * @brief RequestInviteToMUCUIEvent + * @param originator This can be a MUC JID if the user wants to invite + * people to an existing MUC, or a contact JID if this is the + * start of an impromptu group chat. + * @param JIDsToInvite This is a std::vector of JIDs which are prefilled + * in the invite dialog. + * @param impromptu This flag indicates whether it is a normal MUC invite + * or an impromptu MUC invite. + */ + RequestInviteToMUCUIEvent(const JID& originator, const std::vector<JID>& JIDsToInvite, ImpromptuMode impromptu) : originator_(originator), invite_(JIDsToInvite) { isImpromptu_ = impromptu == Impromptu; } - const JID& getRoom() const { - return room_; + const JID& getOriginator() const { + return originator_; } const std::vector<JID> getInvites() const { @@ -46,7 +56,7 @@ namespace Swift { } private: - JID room_; + JID originator_; std::vector<JID> invite_; bool isImpromptu_; }; |