Trample Sonar warnings

6 files changed, 18 insertions, 16 deletions

diff --git a/lib/connection.cpp b/lib/connection.cpp
index 0afbffbc..51c2062f 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -648,7 +648,9 @@ void Connection::Private::completeSetup(const QString& mxId)
         });
     } else {
         // account already existing
-        olmAccount->unpickle(database->accountPickle(), picklingMode);
+        if (!olmAccount->unpickle(database->accountPickle(), picklingMode))
+            qWarning(E2EE)
+                << "Could not unpickle Olm account, E2EE won't be available";
     }
 #endif // Quotient_E2EE_ENABLED
     emit q->stateChanged();
diff --git a/lib/e2ee/qolmaccount.cpp b/lib/e2ee/qolmaccount.cpp
index d03bcb3b..7392a9f5 100644
--- a/lib/e2ee/qolmaccount.cpp
+++ b/lib/e2ee/qolmaccount.cpp
@@ -43,15 +43,16 @@ QOlmAccount::~QOlmAccount()
 void QOlmAccount::createNewAccount()
 {
     m_account = olm_account(new uint8_t[olm_account_size()]);
-    const auto randomLength = olm_create_account_random_length(m_account);
-    if (olm_create_account(m_account, RandomBuffer(randomLength), randomLength)
+    if (const auto randomLength = olm_create_account_random_length(m_account);
+        olm_create_account(m_account, RandomBuffer(randomLength), randomLength)
         == olm_error())
         QOLM_INTERNAL_ERROR("Failed to create a new account");
 
     emit needsSave();
 }
 
-OlmErrorCode QOlmAccount::unpickle(QByteArray&& pickled, const PicklingMode &mode)
+OlmErrorCode QOlmAccount::unpickle(QByteArray&& pickled,
+                                   const PicklingMode& mode)
 {
     m_account = olm_account(new uint8_t[olm_account_size()]);
     if (const auto key = toKey(mode);
diff --git a/lib/e2ee/qolminboundsession.cpp b/lib/e2ee/qolminboundsession.cpp
index 1e3803f2..18275dc0 100644
--- a/lib/e2ee/qolminboundsession.cpp
+++ b/lib/e2ee/qolminboundsession.cpp
@@ -49,7 +49,7 @@ QOlmExpected<QOlmInboundGroupSessionPtr> QOlmInboundGroupSession::create(
     return std::make_unique<QOlmInboundGroupSession>(olmInboundGroupSession);
 }
 
-QOlmExpected<QOlmInboundGroupSessionPtr> QOlmInboundGroupSession::import(
+QOlmExpected<QOlmInboundGroupSessionPtr> QOlmInboundGroupSession::importSession(
     const QByteArray& key)
 {
     const auto olmInboundGroupSession = olm_inbound_group_session(new uint8_t[olm_inbound_group_session_size()]);
diff --git a/lib/e2ee/qolminboundsession.h b/lib/e2ee/qolminboundsession.h
index 15979a05..b9710354 100644
--- a/lib/e2ee/qolminboundsession.h
+++ b/lib/e2ee/qolminboundsession.h
@@ -19,7 +19,7 @@ public:
     //! Creates a new instance of `OlmInboundGroupSession`.
     static QOlmExpected<QOlmInboundGroupSessionPtr> create(const QByteArray& key);
     //! Import an inbound group session, from a previous export.
-    static QOlmExpected<QOlmInboundGroupSessionPtr> import(const QByteArray& key);
+    static QOlmExpected<QOlmInboundGroupSessionPtr> importSession(const QByteArray& key);
     //! Serialises an `OlmInboundGroupSession` to encrypted Base64.
     QByteArray pickle(const PicklingMode& mode) const;
     //! Deserialises from encrypted Base64 that was previously obtained by pickling
diff --git a/lib/e2ee/qolmoutboundsession.cpp b/lib/e2ee/qolmoutboundsession.cpp
index 18af5569..56f78906 100644
--- a/lib/e2ee/qolmoutboundsession.cpp
+++ b/lib/e2ee/qolmoutboundsession.cpp
@@ -33,9 +33,9 @@ QOlmOutboundGroupSession::~QOlmOutboundGroupSession()
 QOlmOutboundGroupSessionPtr QOlmOutboundGroupSession::create()
 {
     auto *olmOutboundGroupSession = olm_outbound_group_session(new uint8_t[olm_outbound_group_session_size()]);
-    const auto randomLength = olm_init_outbound_group_session_random_length(olmOutboundGroupSession);
-
-    if (olm_init_outbound_group_session(olmOutboundGroupSession,
+    if (const auto randomLength = olm_init_outbound_group_session_random_length(
+            olmOutboundGroupSession);
+        olm_init_outbound_group_session(olmOutboundGroupSession,
                                         RandomBuffer(randomLength).bytes(),
                                         randomLength)
         == olm_error()) {
diff --git a/lib/e2ee/qolmsession.cpp b/lib/e2ee/qolmsession.cpp
index 0d6edd21..e3f69132 100644
--- a/lib/e2ee/qolmsession.cpp
+++ b/lib/e2ee/qolmsession.cpp
@@ -80,10 +80,9 @@ QOlmExpected<QOlmSessionPtr> QOlmSession::createOutboundSession(
     const QByteArray& theirOneTimeKey)
 {
     auto* olmOutboundSession = create();
-    const auto randomLength =
-        olm_create_outbound_session_random_length(olmOutboundSession);
-
-    if (olm_create_outbound_session(
+    if (const auto randomLength =
+            olm_create_outbound_session_random_length(olmOutboundSession);
+        olm_create_outbound_session(
             olmOutboundSession, account->data(), theirIdentityKey.data(),
             theirIdentityKey.length(), theirOneTimeKey.data(),
             theirOneTimeKey.length(), RandomBuffer(randomLength), randomLength)
@@ -136,11 +135,11 @@ QOlmMessage QOlmSession::encrypt(const QByteArray& plaintext)
 {
     const auto messageMaxLength =
         olm_encrypt_message_length(m_session, plaintext.length());
-    QByteArray messageBuf(messageMaxLength, '0');
+    QByteArray messageBuf(messageMaxLength, '\0');
     // NB: The type has to be calculated before calling olm_encrypt()
     const auto messageType = olm_encrypt_message_type(m_session);
-    const auto randomLength = olm_encrypt_random_length(m_session);
-    if (olm_encrypt(m_session, plaintext.data(), plaintext.length(),
+    if (const auto randomLength = olm_encrypt_random_length(m_session);
+        olm_encrypt(m_session, plaintext.data(), plaintext.length(),
                     RandomBuffer(randomLength), randomLength, messageBuf.data(),
                     messageBuf.length())
         == olm_error()) {