From a11b1221a379f25aa13d42e3416a214ce131a098 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Tue, 21 Feb 2023 01:37:05 +0100
Subject: [PATCH] Switch to upstream olm error code
---
CMakeLists.txt | 2 +-
io.github.NhekoReborn.Nheko.yaml | 4 ++--
src/encryption/Olm.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0835120f2..7359f0e7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -597,7 +597,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare(
MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
- GIT_TAG v0.9.2
+ GIT_TAG e1a24f3752543d4264cb012a20d84fc9d7229709
)
set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml
index 5e4378014..4eefd87ba 100644
--- a/io.github.NhekoReborn.Nheko.yaml
+++ b/io.github.NhekoReborn.Nheko.yaml
@@ -213,8 +213,8 @@ modules:
buildsystem: cmake-ninja
name: mtxclient
sources:
- - commit: a9a6087ae820c8fb9332422b094cab8e2301db25
- tag: v0.9.2
+ - commit: e1a24f3752543d4264cb012a20d84fc9d7229709
+ #tag: v0.9.2
type: git
url: https://github.com/Nheko-Reborn/mtxclient.git
- config-opts:
diff --git a/src/encryption/Olm.cpp b/src/encryption/Olm.cpp
index 6c5044be9..4a6742dbc 100644
--- a/src/encryption/Olm.cpp
+++ b/src/encryption/Olm.cpp
@@ -1262,7 +1262,7 @@ decryptEvent(const MegolmSessionIndex &index,
} catch (const lmdb::error &e) {
return {DecryptionErrorCode::DbError, e.what(), std::nullopt};
} catch (const mtx::crypto::olm_exception &e) {
- if (e.error_code() == mtx::crypto::OlmErrorCode::UNKNOWN_MESSAGE_INDEX)
+ if (e.error_code() == mtx::crypto::OlmErrorCode::OLM_UNKNOWN_MESSAGE_INDEX)
return {DecryptionErrorCode::MissingSessionIndex, e.what(), std::nullopt};
return {DecryptionErrorCode::DecryptionFailed, e.what(), std::nullopt};
}
--
GitLab