filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: Update to the latest ruma

Browse Source
This commit is contained in:
Damir Jelić 2021-11-09 14:10:24 +01:00
parent 50268540c3
commit f1da5a1c7c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-sdk/Cargo.toml
View File

@ -45,7 +45,7 @@ features = ["rt-multi-thread"]
[dependencies.ruma] [dependencies.ruma]
git = "https://github.com/ruma/ruma" git = "https://github.com/ruma/ruma"
rev = "0101e110f" rev = "ac6ecc3e5"
features = ["client-api-c"] features = ["client-api-c"]
[build-dependencies] [build-dependencies]

6
rust-sdk/src/machine.rs
View File

@ -21,7 +21,7 @@ use ruma::{
IncomingResponse, IncomingResponse,
}, },
events::{ events::{
key::verification::VerificationMethod, room::encrypted::EncryptedEventContent, key::verification::VerificationMethod, room::encrypted::RoomEncryptedEventContent,
AnyMessageEventContent, EventContent, SyncMessageEvent, AnyMessageEventContent, EventContent, SyncMessageEvent,
}, },
DeviceKeyAlgorithm, EventId, RoomId, UserId, DeviceKeyAlgorithm, EventId, RoomId, UserId,
@ -527,7 +527,7 @@ impl OlmMachine {
content: &'a RawValue, content: &'a RawValue,
} }
let event: SyncMessageEvent<EncryptedEventContent> = serde_json::from_str(event)?; let event: SyncMessageEvent<RoomEncryptedEventContent> = serde_json::from_str(event)?;
let room_id = RoomId::try_from(room_id)?; let room_id = RoomId::try_from(room_id)?;
let decrypted = self let decrypted = self
@ -570,7 +570,7 @@ impl OlmMachine {
event: &str, event: &str,
room_id: &str, room_id: &str,
) -> Result<KeyRequestPair, DecryptionError> { ) -> Result<KeyRequestPair, DecryptionError> {
let event: SyncMessageEvent<EncryptedEventContent> = serde_json::from_str(event)?; let event: SyncMessageEvent<RoomEncryptedEventContent> = serde_json::from_str(event)?;
let room_id = RoomId::try_from(room_id)?; let room_id = RoomId::try_from(room_id)?;
let (cancel, request) = self let (cancel, request) = self