mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-18 05:30:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

sdk: Clean up imports in encryption module

Browse Source
This commit is contained in:
Jonas Platte
2023-06-21 09:36:12 +02:00
committed by Jonas Platte
parent 8a7da622d8
commit b883ec000a
2 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/matrix-sdk/src/encryption/futures.rs
View File

@@ -8,6 +8,7 @@ use cfg_vis::cfg_vis;
use eyeball::shared::Observable as SharedObservable;
#[cfg(not(target_arch = "wasm32"))]
use eyeball::Subscriber;
use ruma::events::room::{EncryptedFile, EncryptedFileInit};
use crate::{Client, Result, TransmissionProgress};
@@ -52,7 +53,7 @@ impl<'a, R> IntoFuture for PrepareEncryptedFile<'a, R>
where
R: Read + Send + ?Sized + 'a,
{
type Output = Result<ruma::events::room::EncryptedFile>;
type Output = Result<EncryptedFile>;
#[cfg(target_arch = "wasm32")]
type IntoFuture = Pin<Box<dyn Future<Output = Self::Output> + 'a>>;
#[cfg(not(target_arch = "wasm32"))]
@@ -72,9 +73,9 @@ where
.with_send_progress_observable(send_progress)
.await?;
let file: ruma::events::room::EncryptedFile = {
let file: EncryptedFile = {
let keys = encryptor.finish();
ruma::events::room::EncryptedFileInit {
EncryptedFileInit {
url: response.content_uri,
key: keys.key,
iv: keys.iv,

70
crates/matrix-sdk/src/encryption/mod.rs
View File

@@ -18,7 +18,7 @@
use std::{
collections::{BTreeMap, HashSet},
io::{Read, Write},
io::{Cursor, Read, Write},
iter,
path::PathBuf,
};
@@ -38,7 +38,15 @@ use ruma::{
},
uiaa::AuthData,
},
assign, DeviceId, OwnedDeviceId, OwnedUserId, TransactionId, UserId,
assign,
events::room::{
message::{
AudioInfo, AudioMessageEventContent, FileInfo, FileMessageEventContent,
ImageMessageEventContent, MessageType, VideoInfo, VideoMessageEventContent,
},
ImageInfo, MediaSource, ThumbnailInfo,
},
DeviceId, OwnedDeviceId, OwnedUserId, TransactionId, UserId,
};
use tokio::sync::RwLockReadGuard;
use tracing::{debug, instrument, trace, warn};
@@ -125,12 +133,12 @@ impl Client {
/// # use url::Url;
/// # use matrix_sdk::ruma::{room_id, OwnedRoomId};
/// use serde::{Deserialize, Serialize};
/// use matrix_sdk::ruma::events::macros::EventContent;
/// use matrix_sdk::ruma::events::{macros::EventContent, room::EncryptedFile};
///
/// #[derive(Clone, Debug, Deserialize, Serialize, EventContent)]
/// #[ruma_event(type = "com.example.custom", kind = MessageLike)]
/// struct CustomEventContent {
/// encrypted_file: matrix_sdk::ruma::events::room::EncryptedFile,
/// encrypted_file: EncryptedFile,
/// }
///
/// # async {
@@ -161,7 +169,7 @@ impl Client {
info: Option<AttachmentInfo>,
thumbnail: Option<Thumbnail>,
send_progress: SharedObservable<TransmissionProgress>,
) -> Result<ruma::events::room::message::MessageType> {
) -> Result<MessageType> {
// FIXME: Upload the thumbnail in parallel with the main file
let (thumbnail_source, thumbnail_info) = if let Some(thumbnail) = thumbnail {
let mut cursor = Cursor::new(thumbnail.data);
@@ -170,7 +178,6 @@ impl Client {
.prepare_encrypted_file(content_type, &mut cursor)
.with_send_progress_observable(send_progress.clone())
.await?;
use ruma::events::room::ThumbnailInfo;
#[rustfmt::skip]
let thumbnail_info =
@@ -189,59 +196,48 @@ impl Client {
.with_send_progress_observable(send_progress)
.await?;
use std::io::Cursor;
use ruma::events::room::{self, message, MediaSource};
Ok(match content_type.type_() {
mime::IMAGE => {
let info = assign!(info.map(room::ImageInfo::from).unwrap_or_default(), {
let info = assign!(info.map(ImageInfo::from).unwrap_or_default(), {
mimetype: Some(content_type.as_ref().to_owned()),
thumbnail_source,
thumbnail_info
});
#[rustfmt::skip] // rustfmt wants to merge the next two lines
let content =
assign!(message::ImageMessageEventContent::encrypted(body.to_owned(), file), {
info: Some(Box::new(info))
});
message::MessageType::Image(content)
let content = assign!(ImageMessageEventContent::encrypted(body.to_owned(), file), {
info: Some(Box::new(info))
});
MessageType::Image(content)
}
mime::AUDIO => {
let info = assign!(info.map(message::AudioInfo::from).unwrap_or_default(), {
let info = assign!(info.map(AudioInfo::from).unwrap_or_default(), {
mimetype: Some(content_type.as_ref().to_owned()),
});
#[rustfmt::skip] // rustfmt wants to merge the next two lines
let content =
assign!(message::AudioMessageEventContent::encrypted(body.to_owned(), file), {
info: Some(Box::new(info))
});
message::MessageType::Audio(content)
let content = assign!(AudioMessageEventContent::encrypted(body.to_owned(), file), {
info: Some(Box::new(info))
});
MessageType::Audio(content)
}
mime::VIDEO => {
let info = assign!(info.map(message::VideoInfo::from).unwrap_or_default(), {
let info = assign!(info.map(VideoInfo::from).unwrap_or_default(), {
mimetype: Some(content_type.as_ref().to_owned()),
thumbnail_source,
thumbnail_info
});
#[rustfmt::skip] // rustfmt wants to merge the next two lines
let content =
assign!(message::VideoMessageEventContent::encrypted(body.to_owned(), file), {
info: Some(Box::new(info))
});
message::MessageType::Video(content)
let content = assign!(VideoMessageEventContent::encrypted(body.to_owned(), file), {
info: Some(Box::new(info))
});
MessageType::Video(content)
}
_ => {
let info = assign!(info.map(message::FileInfo::from).unwrap_or_default(), {
let info = assign!(info.map(FileInfo::from).unwrap_or_default(), {
mimetype: Some(content_type.as_ref().to_owned()),
thumbnail_source,
thumbnail_info
});
#[rustfmt::skip] // rustfmt wants to merge the next two lines
let content =
assign!(message::FileMessageEventContent::encrypted(body.to_owned(), file), {
info: Some(Box::new(info))
});
message::MessageType::File(content)
let content = assign!(FileMessageEventContent::encrypted(body.to_owned(), file), {
info: Some(Box::new(info))
});
MessageType::File(content)
}
})
}