Merge remote-tracking branch 'upstream/master' into webrtc-video

1 files changed, 10 insertions, 0 deletions

diff --git a/src/CacheCryptoStructs.h b/src/CacheCryptoStructs.h

index 935d6493..a693e233 100644
--- a/src/CacheCryptoStructs.h
+++ b/src/CacheCryptoStructs.h
@@ -66,6 +66,16 @@ struct OlmSessionStorage
         std::mutex group_inbound_mtx;
 };
 
+struct StoredOlmSession
+{
+        std::uint64_t last_message_ts = 0;
+        std::string pickled_session;
+};
+void
+to_json(nlohmann::json &obj, const StoredOlmSession &msg);
+void
+from_json(const nlohmann::json &obj, StoredOlmSession &msg);
+
 //! Verification status of a single user
 struct VerificationStatus
 {