Merge remote-tracking branch 'origin/main' into jplatte/matrix-sdk-ffi

Cargo.toml

@@ -2,3 +2,5 @@
 members = ["benchmarks", "crates/*", "labs/*", "xtask"]
 # xtask and labs should only be compiled when invoked explicitly
 default-members = ["benchmarks", "crates/*"]
+
+resolver = "2"

crates/matrix-sdk-crypto/src/machine.rs

@@ -638,11 +638,6 @@ impl OlmMachine {
     /// Beware that a group session needs to be shared before this method can be
     /// called using the [`share_group_session`] method.
     ///
-    /// Since group sessions can expire or become invalid if the room membership
-    /// changes client authors should check with the
-    /// [`should_share_group_session`] method if a new group session needs to
-    /// be shared.
-    ///
     /// # Arguments
     ///
     /// * `room_id` - The id of the room for which the message should be
@@ -654,9 +649,6 @@ impl OlmMachine {
     /// # Panics
     ///
     /// Panics if a group session for the given room wasn't shared beforehand.
-    ///
-    /// [`should_share_group_session`]: #method.should_share_group_session
-    /// [`share_group_session`]: #method.share_group_session
     pub async fn encrypt(
         &self,
         room_id: &RoomId,

crates/matrix-sdk-test/src/test_json/sync.rs

@@ -210,30 +210,6 @@ pub static SYNC: Lazy<JsonValue> = Lazy::new(|| {
                                     "replaces_state": "$152034819067QWJxM:localhost"
                                 }
                             },
-                            {
-                                "content": {
-                                "membership": "leave",
-                                "reason": "offline",
-                                "avatar_url": "mxc://avatar.com/d0dV9jLpe",
-                                "displayname": "example"
-                                },
-                                "event_id": "$1585345508297748AIUBh:matrix.org",
-                                "origin_server_ts": 158534550,
-                                "sender": "@example:localhost",
-                                "state_key": "@example:localhost",
-                                "type": "m.room.member",
-                                "unsigned": {
-                                "replaces_state": "$1585345354296486IGZfp:localhost",
-                                "prev_content": {
-                                    "avatar_url": "mxc://avatar.com/d0dV9jLpe",
-                                    "displayname": "example",
-                                    "membership": "join"
-                                },
-                                "prev_sender": "@example2:localhost",
-                                "age": 6992
-                                },
-                                "room_id": "!roomid:room.com"
-                            }
                         ]
                     },
                     "timeline": {

crates/matrix-sdk/src/client/mod.rs

@@ -3362,7 +3362,7 @@ pub(crate) mod tests {
         let room = client.get_joined_room(room_id!("!SVkFJHzfwvuaIEawgC:localhost")).unwrap();
         let members: Vec<RoomMember> = room.active_members().await.unwrap();
 
-        assert_eq!(1, members.len());
+        assert_eq!(2, members.len());
         // assert!(room.power_levels.is_some())
     }