[fractal] chore: Update matrix-sdk



commit a6f293ccbae84e7d4169dec040d6ad7f3feb2a25
Author: Julian Sparber <julian sparber net>
Date:   Fri May 27 17:15:32 2022 +0200

    chore: Update matrix-sdk

 Cargo.lock                                         | 28 +++++++++++-----------
 .../account_settings/devices_page/device_list.rs   |  6 ++---
 src/session/account_settings/user_page/mod.rs      |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index cccc919a2..04384a6ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -203,9 +203,9 @@ dependencies = [
 
 [[package]]
 name = "async-once-cell"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8e52116ee51c72c07a9db74c6f95213c95c462408bb5a689772d623a62b96471"
+checksum = "72faff1fdc615a0199d7bf71e6f389af54d46a66e9beb5d76c39e48eda93ecce"
 
 [[package]]
 name = "async-recursion"
@@ -2345,7 +2345,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 [[package]]
 name = "matrix-sdk"
 version = "0.5.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#2d7fb1b61c25cec168bd120046c3ed75815822b2";
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#fa7c1b60f6c681878a3648ebe701a16b60814d01";
 dependencies = [
  "anymap2",
  "async-once-cell",
@@ -2381,7 +2381,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.5.1"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#2d7fb1b61c25cec168bd120046c3ed75815822b2";
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#fa7c1b60f6c681878a3648ebe701a16b60814d01";
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2392,6 +2392,7 @@ dependencies = [
  "lru 0.7.5",
  "matrix-sdk-common",
  "matrix-sdk-crypto",
+ "once_cell",
  "ruma",
  "serde",
  "serde_json",
@@ -2403,7 +2404,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.5.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#2d7fb1b61c25cec168bd120046c3ed75815822b2";
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#fa7c1b60f6c681878a3648ebe701a16b60814d01";
 dependencies = [
  "async-lock",
  "futures-util",
@@ -2417,7 +2418,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.5.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#2d7fb1b61c25cec168bd120046c3ed75815822b2";
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#fa7c1b60f6c681878a3648ebe701a16b60814d01";
 dependencies = [
  "aes",
  "async-trait",
@@ -2445,7 +2446,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-indexeddb"
 version = "0.1.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#2d7fb1b61c25cec168bd120046c3ed75815822b2";
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#fa7c1b60f6c681878a3648ebe701a16b60814d01";
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2469,7 +2470,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-qrcode"
 version = "0.3.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#2d7fb1b61c25cec168bd120046c3ed75815822b2";
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#fa7c1b60f6c681878a3648ebe701a16b60814d01";
 dependencies = [
  "base64",
  "byteorder",
@@ -2484,7 +2485,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-sled"
 version = "0.1.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#2d7fb1b61c25cec168bd120046c3ed75815822b2";
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#fa7c1b60f6c681878a3648ebe701a16b60814d01";
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2507,7 +2508,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-store-encryption"
 version = "0.1.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#2d7fb1b61c25cec168bd120046c3ed75815822b2";
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#fa7c1b60f6c681878a3648ebe701a16b60814d01";
 dependencies = [
  "blake3",
  "chacha20poly1305",
@@ -2803,9 +2804,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.9.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
+checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
 
 [[package]]
 name = "opaque-debug"
@@ -4506,8 +4507,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 [[package]]
 name = "vodozemac"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3a42265bb5d65ba2807e477741ca3147a58d25ee5463860491fe0c24f4d21c1a"
+source = 
"git+https://github.com/matrix-org/vodozemac/?rev=d0e744287a14319c2a9148fef3747548c740fc36#d0e744287a14319c2a9148fef3747548c740fc36";
 dependencies = [
  "aes",
  "arrayvec 0.7.2",
diff --git a/src/session/account_settings/devices_page/device_list.rs 
b/src/session/account_settings/devices_page/device_list.rs
index c16ec0129..45e69081a 100644
--- a/src/session/account_settings/devices_page/device_list.rs
+++ b/src/session/account_settings/devices_page/device_list.rs
@@ -202,8 +202,8 @@ impl DeviceList {
         self.set_loading(true);
 
         let handle = spawn_tokio!(async move {
-            let user_id = client.user_id().await.unwrap();
-            let crypto_devices = client.encryption().get_user_devices(&user_id).await;
+            let user_id = client.user_id().unwrap();
+            let crypto_devices = client.encryption().get_user_devices(user_id).await;
 
             let crypto_devices = match crypto_devices {
                 Ok(crypto_devices) => crypto_devices,
@@ -216,7 +216,7 @@ impl DeviceList {
                         .devices
                         .sort_unstable_by(|a, b| b.last_seen_ts.cmp(&a.last_seen_ts));
 
-                    let current_device = if let Some(current_device_id) = client.device_id().await {
+                    let current_device = if let Some(current_device_id) = client.device_id() {
                         if let Some(index) = response
                             .devices
                             .iter()
diff --git a/src/session/account_settings/user_page/mod.rs b/src/session/account_settings/user_page/mod.rs
index ef2c04b39..c10891c76 100644
--- a/src/session/account_settings/user_page/mod.rs
+++ b/src/session/account_settings/user_page/mod.rs
@@ -179,10 +179,10 @@ impl UserPage {
                 let homeserver = client.homeserver().await;
                 priv_.homeserver.set_label(homeserver.as_ref());
 
-                let user_id = client.user_id().await.unwrap();
+                let user_id = client.user_id().unwrap();
                 priv_.user_id.set_label(user_id.as_ref());
 
-                let session_id = client.device_id().await.unwrap();
+                let session_id = client.device_id().unwrap();
                 priv_.session_id.set_label(session_id.as_ref());
             })
         );


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]