-
Notifications
You must be signed in to change notification settings - Fork 197
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
AccountMigration: Improve and fix migration of MIX channels #657
Conversation
9041fa3
to
9c7f0fd
Compare
9c7f0fd
to
78a05b8
Compare
QXmppMovedManager: Fix doxygen missing documentation I fixed this on master now without using QXmppClient::EmptyResult. The alias |
1e1ee0e
to
e69f349
Compare
Can you change the commit description so that it properly describes the changes (not just "more utils"), e.g. |
Please include that this is only about data import/export in the commit description. And in the long description you could note what is actually fixed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
apart from last minor comments looks good :)
2a38fc1
to
08a918d
Compare
0a7b4fd
to
ee6252f
Compare
The id is returned (if found).
The original xmlToDom now uses xmlToDomDoc under the wood.
Some tests are more complex and involve inner tasks in between calls and the test client does not handle that great, leading to iq id clash and random iq id generation which make tests unreliable. This is especially visible when a test involve many expect/inject calls like in the migration manager tests.
The QXmppExportData class store data in an unordered_map and would then serialize each extensions in a random order, which break string based unit tests. We then serialize in the std::type_index sorting order.
It can filter and convert items into a given output container.
Originally we only stored the roster as is in the QXmppRosterManager without taking care of MIX channels. This change split the handling of data, QXmppMixManager now export/import the MIX roster items taking care to join again those channels later while QXmppRosterManager now export/import non MIX roster items.
Packets are found no matter in what order they were sent. The IQ IDs are ignored while comparing.
ee6252f
to
0beb4aa
Compare
PR check list:
\since QXmpp 1.X
,QXMPP_EXPORT
doc/doap.xml
clang-format -i src/<edited-file(s)> tests/<edited-file(s)>
Fixed a bunch of issues in the QXmppAccountMigrationManager: