From e4a7e859354653d4ddd60dc9e2b83132feffaceb Mon Sep 17 00:00:00 2001
From: CH Chethan Reddy <40890937+Chethan2k1@users.noreply.github.com>
Date: Fri, 15 May 2020 16:33:51 +0530
Subject: [PATCH] Change the commit hash for mtxclient

---
 CMakeLists.txt                   |  2 +-
 io.github.NhekoReborn.Nheko.json |  4 ++--
 src/ChatPage.cpp                 |  2 +-
 src/Olm.cpp                      | 13 ++++++++-----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed714e31..04d20690 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -337,7 +337,7 @@ if(USE_BUNDLED_MTXCLIENT)
 	FetchContent_Declare(
 		MatrixClient
 		GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
-		GIT_TAG        71bd56b66cf634341ffef804f07d33f01fd57c25
+		GIT_TAG        dfc39651ac02b48787b9d4e27932ef2feceb162c
 		)
 	FetchContent_MakeAvailable(MatrixClient)
 else()
diff --git a/io.github.NhekoReborn.Nheko.json b/io.github.NhekoReborn.Nheko.json
index 60d984fb..b6f7e708 100644
--- a/io.github.NhekoReborn.Nheko.json
+++ b/io.github.NhekoReborn.Nheko.json
@@ -146,9 +146,9 @@
       "name": "mtxclient",
       "sources": [
         {
-          "sha256": "7055f1459a43a12f27f949564624f13cc593ac894e445e6de0e6563ad38ebc3e",
+          "sha256": "4f859cdcb42b052ed07d55ac8890e9051fa49a1e8bc43648106ddce351b6868b",
           "type": "archive",
-          "url": "https://github.com/Nheko-Reborn/mtxclient/archive/71bd56b66cf634341ffef804f07d33f01fd57c25.tar.gz"
+          "url": "https://github.com/Nheko-Reborn/mtxclient/archive/dfc39651ac02b48787b9d4e27932ef2feceb162c.tar.gz"
         }
       ]
     },
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 5450cdfa..d0ca4670 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -1010,7 +1010,7 @@ ChatPage::trySync()
 
                   // TODO: fine grained error handling
                   try {
-                          cache::saveState(res);        
+                          cache::saveState(res);
                           olm::handle_to_device_messages(res.to_device.events);
 
                           auto updates = cache::roomUpdates(res);
diff --git a/src/Olm.cpp b/src/Olm.cpp
index 1f87b3f9..2c4f6186 100644
--- a/src/Olm.cpp
+++ b/src/Olm.cpp
@@ -32,7 +32,7 @@ handle_to_device_messages(const std::vector<mtx::events::collections::DeviceEven
         nlohmann::json j_msg;
 
         for (const auto &msg : msgs) {
-                j_msg = std::visit([](auto &e){ return json(e); },std::move(msg));
+                j_msg = std::visit([](auto &e) { return json(e); }, std::move(msg));
                 if (j_msg.count("type") == 0) {
                         nhlog::crypto()->warn("received message with no type field: {}",
                                               j_msg.dump(2));
@@ -49,8 +49,9 @@ handle_to_device_messages(const std::vector<mtx::events::collections::DeviceEven
                                 nhlog::crypto()->warn(
                                   "parsing error for olm message: {} {}", e.what(), j_msg.dump(2));
                         } catch (const std::invalid_argument &e) {
-                                nhlog::crypto()->warn(
-                                  "validation error for olm message: {} {}", e.what(), j_msg.dump(2));
+                                nhlog::crypto()->warn("validation error for olm message: {} {}",
+                                                      e.what(),
+                                                      j_msg.dump(2));
                         }
 
                 } else if (msg_type == to_string(mtx::events::EventType::RoomKeyRequest)) {
@@ -364,7 +365,8 @@ handle_key_request_message(const mtx::events::DeviceEvent<mtx::events::msg::KeyR
 
         // Check if we have the keys for the requested session.
         if (!cache::outboundMegolmSessionExists(req.content.room_id)) {
-                nhlog::crypto()->warn("requested session not found in room: {}", req.content.room_id);
+                nhlog::crypto()->warn("requested session not found in room: {}",
+                                      req.content.room_id);
                 return;
         }
 
@@ -387,7 +389,8 @@ handle_key_request_message(const mtx::events::DeviceEvent<mtx::events::msg::KeyR
         }
 
         if (!utils::respondsToKeyRequests(req.content.room_id)) {
-                nhlog::crypto()->debug("ignoring all key requests for room {}", req.content.room_id);
+                nhlog::crypto()->debug("ignoring all key requests for room {}",
+                                       req.content.room_id);
                 return;
         }