char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

device: Add a method to create a Device from an Account.

master
Damir Jelić 2020-07-22 13:41:49 +02:00
parent 4fa58bfaac
commit a7bc1a95d3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
matrix_sdk_crypto/src/device.rs
View File

@ -21,7 +21,7 @@ use atomic::Atomic;
use serde_json::{json, Value}; use serde_json::{json, Value};
#[cfg(test)] #[cfg(test)]
use super::OlmMachine; use super::{Account, OlmMachine};
use matrix_sdk_common::api::r0::keys::{AlgorithmAndDeviceId, DeviceKeys, KeyAlgorithm, SignedKey}; use matrix_sdk_common::api::r0::keys::{AlgorithmAndDeviceId, DeviceKeys, KeyAlgorithm, SignedKey};
use matrix_sdk_common::events::Algorithm; use matrix_sdk_common::events::Algorithm;
use matrix_sdk_common::identifiers::{DeviceId, UserId}; use matrix_sdk_common::identifiers::{DeviceId, UserId};
@ -187,7 +187,12 @@ impl Device {
#[cfg(test)] #[cfg(test)]
pub async fn from_machine(machine: &OlmMachine) -> Device { pub async fn from_machine(machine: &OlmMachine) -> Device {
let device_keys = machine.account.device_keys().await; Device::from_account(&machine.account).await
}
#[cfg(test)]
pub async fn from_account(account: &Account) -> Device {
let device_keys = account.device_keys().await;
Device::try_from(&device_keys).unwrap() Device::try_from(&device_keys).unwrap()
} }
} }