chore: Update matrix-sdk

Cargo.lock

@@ -208,12 +208,6 @@ dependencies = [
  "event-listener",
 ]
 
-[[package]]
-name = "async-once-cell"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b49bd4c5b769125ea6323601c39815848972880efd33ffb2d01f9f909adc699"
-
 [[package]]
 name = "async-process"
 version = "1.6.0"
@@ -402,12 +396,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitmaps"
-version = "2.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2"
-dependencies = [
- "typenum",
-]
+checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403"
 
 [[package]]
 name = "blake3"
@@ -1157,12 +1148,12 @@ dependencies = [
 
 [[package]]
 name = "eyeball-im"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5240948c0d831a678fcfc10439d3f202088723e38e14bccbdbb6a3b61c54d1ab"
+checksum = "29e6dff0ac9894dcc183064377dfeb4137bcffa9f9ec3dbc10f8e7fba34c0ac7"
 dependencies = [
  "futures-core",
- "im",
+ "imbl",
  "tokio",
  "tokio-stream",
 ]
@@ -2361,21 +2352,6 @@ dependencies = [
  "unicode-normalization",
 ]
 
-[[package]]
-name = "im"
-version = "15.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9"
-dependencies = [
- "bitmaps",
- "rand_core 0.6.4",
- "rand_xoshiro",
- "serde",
- "sized-chunks",
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "image"
 version = "0.23.14"
@@ -2409,6 +2385,29 @@ dependencies = [
  "tiff",
 ]
 
+[[package]]
+name = "imbl"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2806b69cd9f4664844027b64465eacb444c67c1db9c778e341adff0c25cdb0d"
+dependencies = [
+ "bitmaps",
+ "imbl-sized-chunks",
+ "rand_core 0.6.4",
+ "rand_xoshiro",
+ "serde",
+ "version_check",
+]
+
+[[package]]
+name = "imbl-sized-chunks"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076"
+dependencies = [
+ "bitmaps",
+]
+
 [[package]]
 name = "indexed_db_futures"
 version = "0.3.0"
@@ -2827,10 +2826,9 @@ dependencies = [
 [[package]]
 name = "matrix-sdk"
 version = "0.6.2"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=48b67759eded88e26db71a85b4ea8b7e3a153fcd#48b67759eded88e26db71a85b4ea8b7e3a153fcd"
 dependencies = [
  "anymap2",
- "async-once-cell",
  "async-stream",
  "async-trait",
  "backoff",
@@ -2846,8 +2844,8 @@ dependencies = [
  "gloo-timers",
  "http",
  "hyper",
- "im",
  "image 0.24.6",
+ "imbl",
  "indexmap",
  "matrix-sdk-base",
  "matrix-sdk-common",
@@ -2874,7 +2872,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.6.1"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=48b67759eded88e26db71a85b4ea8b7e3a153fcd#48b67759eded88e26db71a85b4ea8b7e3a153fcd"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2890,6 +2888,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
+ "tokio",
  "tracing",
  "zeroize",
 ]
@@ -2897,9 +2896,8 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.6.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=48b67759eded88e26db71a85b4ea8b7e3a153fcd#48b67759eded88e26db71a85b4ea8b7e3a153fcd"
 dependencies = [
- "async-lock",
  "futures-core",
  "futures-util",
  "gloo-timers",
@@ -2914,7 +2912,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.6.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=48b67759eded88e26db71a85b4ea8b7e3a153fcd#48b67759eded88e26db71a85b4ea8b7e3a153fcd"
 dependencies = [
  "aes",
  "async-std",
@@ -2942,6 +2940,7 @@ dependencies = [
  "sha2 0.10.6",
  "thiserror",
  "tokio",
+ "tokio-stream",
  "tracing",
  "vodozemac",
  "zeroize",
@@ -2950,7 +2949,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-indexeddb"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=48b67759eded88e26db71a85b4ea8b7e3a153fcd#48b67759eded88e26db71a85b4ea8b7e3a153fcd"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2967,6 +2966,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
+ "tokio",
  "tracing",
  "wasm-bindgen",
  "web-sys",
@@ -2975,7 +2975,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-qrcode"
 version = "0.4.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=48b67759eded88e26db71a85b4ea8b7e3a153fcd#48b67759eded88e26db71a85b4ea8b7e3a153fcd"
 dependencies = [
  "base64 0.21.0",
  "byteorder",
@@ -2988,7 +2988,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-sled"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=48b67759eded88e26db71a85b4ea8b7e3a153fcd#48b67759eded88e26db71a85b4ea8b7e3a153fcd"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -3012,7 +3012,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-store-encryption"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=7794b230e1a5a1c8cb6b050b8c947595cb74c8e7#7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=48b67759eded88e26db71a85b4ea8b7e3a153fcd#48b67759eded88e26db71a85b4ea8b7e3a153fcd"
 dependencies = [
  "blake3",
  "chacha20poly1305",
@@ -4501,16 +4501,6 @@ version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
 
-[[package]]
-name = "sized-chunks"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e"
-dependencies = [
- "bitmaps",
- "typenum",
-]
-
 [[package]]
 name = "slab"
 version = "0.4.8"

Cargo.toml

@@ -28,7 +28,7 @@ ashpd = { version = "0.4", default-features = false, features = [
 ] }
 async-stream = "0.3"
 djb_hash = "0.1"
-eyeball-im = "0.1"
+eyeball-im = "0.2"
 futures = "0.3"
 geo-uri = "0.2"
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
@@ -77,7 +77,7 @@ features = ["v4_10"]
 
 [dependencies.matrix-sdk]
 git = "https://github.com/matrix-org/matrix-rust-sdk.git"
-rev = "7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
+rev = "48b67759eded88e26db71a85b4ea8b7e3a153fcd"
 features = [
     "socks",
     "sso-login",
@@ -89,7 +89,7 @@ features = [
 
 [dependencies.matrix-sdk-sled]
 git = "https://github.com/matrix-org/matrix-rust-sdk.git"
-rev = "7794b230e1a5a1c8cb6b050b8c947595cb74c8e7"
+rev = "48b67759eded88e26db71a85b4ea8b7e3a153fcd"
 features = ["crypto-store"]
 
 [dependencies.ruma]

src/session/room_creation/mod.rs

@@ -10,7 +10,7 @@ use matrix_sdk::{
         },
         assign,
     },
-    HttpError,
+    Error,
 };
 use ruma::events::{room::encryption::RoomEncryptionEventContent, InitialStateEvent};
 
@@ -217,7 +217,7 @@ impl RoomCreation {
     }
 
     /// Display the error that occurred during creation.
-    fn handle_error(&self, error: HttpError) {
+    fn handle_error(&self, error: Error) {
         let imp = self.imp();
 
         imp.create_button.set_loading(false);