5 files changed, 33 insertions, 2 deletions
diff --git a/lib/olm/message.cpp b/lib/olm/message.cpp
index 634a6f0c..ac7038ae 100644
--- a/lib/olm/message.cpp
+++ b/lib/olm/message.cpp
@@ -14,6 +14,12 @@ Message::Message(const QByteArray &ciphertext, Message::Type type)
     Q_ASSERT_X(!ciphertext.isEmpty(), "olm message", "Ciphertext is empty");
 }
 
+Message::Message(const Message &message)
+    : QByteArray(message)
+    , m_messageType(message.type())
+{
+}
+
 Message::Type Message::type() const
 {
     return m_messageType;
diff --git a/lib/olm/message.h b/lib/olm/message.h
index 067d9b5a..d2fe871e 100644
--- a/lib/olm/message.h
+++ b/lib/olm/message.h
@@ -18,7 +18,7 @@ namespace Quotient {
  *
  * The class provides functions to get a type and the ciphertext.
  */
-class Message : private QByteArray {
+class Message : public QByteArray {
     Q_GADGET
 public:
     enum Type {
@@ -29,6 +29,7 @@ public:
 
     Message() = default;
     explicit Message(const QByteArray &ciphertext, Type type = General);
+    explicit Message(const Message &message);
 
     static Message fromCiphertext(const QByteArray &ciphertext);
 
diff --git a/lib/olm/qolmoutboundsession.cpp b/lib/olm/qolmoutboundsession.cpp
index 4f3cc827..e5c43495 100644
--- a/lib/olm/qolmoutboundsession.cpp
+++ b/lib/olm/qolmoutboundsession.cpp
@@ -22,7 +22,7 @@ QOlmOutboundGroupSession::QOlmOutboundGroupSession(OlmOutboundGroupSession *sess
 QOlmOutboundGroupSession::~QOlmOutboundGroupSession()
 {
     olm_clear_outbound_group_session(m_groupSession);
-    //delete[](reinterpret_cast<uint8_t *>(m_groupSession));
+    delete[](reinterpret_cast<uint8_t *>(m_groupSession));
 }
 
 std::unique_ptr<QOlmOutboundGroupSession> QOlmOutboundGroupSession::create()
diff --git a/lib/olm/session.cpp b/lib/olm/session.cpp
index 0beb136e..d0493fe8 100644
--- a/lib/olm/session.cpp
+++ b/lib/olm/session.cpp
@@ -18,6 +18,7 @@ OlmError lastError(OlmSession* session) {
 Quotient::QOlmSession::~QOlmSession()
 {
     olm_clear_session(m_session);
+    delete[](reinterpret_cast<uint8_t *>(m_session));
 }
 
 OlmSession* QOlmSession::create()
@@ -170,6 +171,25 @@ bool QOlmSession::hasReceivedMessage() const
     return olm_session_has_received_message(m_session);
 }
 
+std::variant<bool, OlmError> QOlmSession::matchesInboundSession(Message &preKeyMessage)
+{
+    Q_ASSERT(preKeyMessage.type() == Message::Type::PreKey);
+    QByteArray oneTimeKeyBuf(preKeyMessage.data());
+    const auto matchesResult = olm_matches_inbound_session(m_session, oneTimeKeyBuf.data(), oneTimeKeyBuf.length());
+
+    if (matchesResult == olm_error()) {
+        return lastError(m_session);
+    }
+    switch (matchesResult) {
+        case 0:
+            return false;
+        case 1:
+            return true;
+        default:
+            return OlmError::Unknown;
+    }
+}
+
 QOlmSession::QOlmSession(OlmSession *session)
     : m_session(session)
 {
diff --git a/lib/olm/session.h b/lib/olm/session.h
index f9221dec..c45b6898 100644
--- a/lib/olm/session.h
+++ b/lib/olm/session.h
@@ -40,8 +40,12 @@ public:
     //! The type of the next message that will be returned from encryption.
     Message::Type encryptMessageType();
 
+    //! Checker for any received messages for this session.
     bool hasReceivedMessage() const;
 
+    //! Checks if the 'prekey' message is for this in-bound session.
+    std::variant<bool, OlmError> matchesInboundSession(Message &preKeyMessage);
+
     QOlmSession(OlmSession* session);
 private:
     //! Helper function for creating new sessions and handling errors.