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/QtUI/UserSearch | |
| 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/QtUI/UserSearch')
| -rw-r--r-- | Swift/QtUI/UserSearch/QtUserSearchWindow.cpp | 8 | ||||
| -rw-r--r-- | Swift/QtUI/UserSearch/QtUserSearchWindow.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp index e00582c..cf62540 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp +++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp @@ -145,13 +145,13 @@ void QtUserSearchWindow::handleAccepted() { jids.push_back(contact->jid); } - eventStream_->send(std::make_shared<CreateImpromptuMUCUIEvent>(jids, JID(), Q2PSTRING(firstMultiJIDPage_->reason_->text()))); + eventStream_->send(std::make_shared<CreateImpromptuMUCUIEvent>(jids, Q2PSTRING(firstMultiJIDPage_->reason_->text()))); break; case InviteToChat: for (Contact::ref contact : contactVector_) { jids.push_back(contact->jid); } - eventStream_->send(std::make_shared<InviteToMUCUIEvent>(roomJID_, jids, Q2PSTRING(firstMultiJIDPage_->reason_->text()))); + eventStream_->send(std::make_shared<InviteToMUCUIEvent>(originatorJID_, jids, Q2PSTRING(firstMultiJIDPage_->reason_->text()))); break; } } @@ -387,6 +387,10 @@ void QtUserSearchWindow::setJIDs(const std::vector<JID> &jids) { onJIDUpdateRequested(jids); } +void QtUserSearchWindow::setOriginator(const JID& originator) { + originatorJID_ = originator; +} + void QtUserSearchWindow::setRoomJID(const JID& roomJID) { roomJID_ = roomJID; } diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h index 5d8b755..b9d4698 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h +++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h @@ -47,6 +47,7 @@ namespace Swift { virtual void prepopulateJIDAndName(const JID& jid, const std::string& name); virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions); virtual void setJIDs(const std::vector<JID> &jids); + virtual void setOriginator(const JID& originator); virtual void setRoomJID(const JID &roomJID); virtual std::string getReason() const; virtual std::vector<JID> getJIDs() const; @@ -97,6 +98,7 @@ namespace Swift { QtUserSearchDetailsPage* detailsPage_; JID myServer_; JID roomJID_; + JID originatorJID_; int lastPage_; std::vector<Contact::ref> contactVector_; SettingsProvider* settings_; |