aboutsummaryrefslogtreecommitdiff
path: root/autotests/testolmsession.cpp
diff options
context:
space:
mode:
authorAlexey Rusakov <Kitsune-Ral@users.sf.net>2022-09-21 15:45:59 +0200
committerAlexey Rusakov <Kitsune-Ral@users.sf.net>2022-09-26 10:46:34 +0200
commitbcc05aa1d52cae2b6d8e70bb6cf04fa49904687a (patch)
tree7d005271303f9d96de10766cfab4a5b5e2dceafe /autotests/testolmsession.cpp
parent363a7e40e8aa12cb780b076cca8db4f47b70f4fa (diff)
downloadlibquotient-bcc05aa1d52cae2b6d8e70bb6cf04fa49904687a.tar.gz
libquotient-bcc05aa1d52cae2b6d8e70bb6cf04fa49904687a.zip
Cleanup across E2EE code
Notably: - simplified unnecessarily verbose constructs; - formally aligned (no re-numeration was necessary) QOlmMessage::Type with corresponding OLM_ constants; - dropped QOlmSession::encryptMessageType() because it's very sensitive to the order of calling with QOlmSession::encrypt() (and encrypt() itself already calls it and returns the message type); - simplify the return type of pickle() calls that can only fail due to an internal error; - replace const QString& with QStringView or const QByteArray& where appropriate; - use '\0' where it was meant to be instead of '0'.
Diffstat (limited to 'autotests/testolmsession.cpp')
-rw-r--r--autotests/testolmsession.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/autotests/testolmsession.cpp b/autotests/testolmsession.cpp
index 66a04241..18b0d5f2 100644
--- a/autotests/testolmsession.cpp
+++ b/autotests/testolmsession.cpp
@@ -11,12 +11,14 @@ std::pair<QOlmSessionPtr, QOlmSessionPtr> createSessionPair()
{
QByteArray pickledAccountA("eOBXIKivUT6YYowRH031BNv7zNmzqM5B7CpXdyeaPvala5mt7/OeqrG1qVA7vA1SYloFyvJPIy0QNkD3j1HiPl5vtZHN53rtfZ9exXDok03zjmssqn4IJsqcA7Fbo1FZeKafG0NFcWwCPTdmcV7REqxjqGm3I4K8MQFa45AdTGSUu2C12cWeOcbSMlcINiMral+Uyah1sgPmLJ18h1qcnskXUXQvpffZ5DiUw1Iz5zxnwOQF1GVyowPJD7Zdugvj75RQnDxAn6CzyvrY2k2CuedwqDC3fIXM2xdUNWttW4nC2g4InpBhCVvNwhZYxlUb5BUEjmPI2AB3dAL5ry6o9MFncmbN6x5x");
QByteArray pickledAccountB("eModTvoFi9oOIkax4j4nuxw9Tcl/J8mOmUctUWI68Q89HSaaPTqR+tdlKQ85v2GOs5NlZCp7EuycypN9GQ4fFbHUCrS7nspa3GFBWsR8PnM8+wez5PWmfFZLg3drOvT0jbMjpDx0MjGYClHBqcrEpKx9oFaIRGBaX6HXzT4lRaWSJkXxuX92q8iGNrLn96PuAWFNcD+2JXpPcNFntslwLUNgqzpZ04aIFYwL80GmzyOgq3Bz1GO6u3TgCQEAmTIYN2QkO0MQeuSfe7UoMumhlAJ6R8GPcdSSPtmXNk4tdyzzlgpVq1hm7ZLKto+g8/5Aq3PvnvA8wCqno2+Pi1duK1pZFTIlActr");
- auto accountA = QOlmAccount("accountA:foo.com", "Device1UserA");
- if (accountA.unpickle(pickledAccountA, Unencrypted{}) != OLM_SUCCESS)
+ auto accountA = QOlmAccount(u"accountA:foo.com", u"Device1UserA");
+ if (accountA.unpickle(std::move(pickledAccountA), Unencrypted{})
+ != OLM_SUCCESS)
qFatal("Failed to unpickle account A: %s", accountA.lastError());
- auto accountB = QOlmAccount("accountB:foo.com", "Device1UserB");
- if (accountB.unpickle(pickledAccountB, Unencrypted{}) != OLM_SUCCESS)
+ auto accountB = QOlmAccount(u"accountB:foo.com", u"Device1UserB");
+ if (accountB.unpickle(std::move(pickledAccountB), Unencrypted{})
+ != OLM_SUCCESS)
qFatal("Failed to unpickle account B: %s", accountB.lastError());