summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2023-02-21 01:37:05 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2023-02-21 02:21:31 +0100
commita11b1221a379f25aa13d42e3416a214ce131a098 (patch)
treec1c6941f82c2c70ae0aa82973c732eb4c8975d1f
parentMerge branch 'cirrus_updates' into 'master' (diff)
downloadnheko-a11b1221a379f25aa13d42e3416a214ce131a098.tar.xz
Switch to upstream olm error code
-rw-r--r--CMakeLists.txt2
-rw-r--r--io.github.NhekoReborn.Nheko.yaml4
-rw-r--r--src/encryption/Olm.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 0835120f..7359f0e7 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 5e437801..4eefd87b 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 6c5044be..4a6742db 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}; }