Merge remote-tracking branch 'origin/main' into rav/history_sharing/upload_bundle

Author: richvdh

Cargo.lock

@@ -101,17 +101,17 @@ web-sys = "0.3.69"
 wiremock = "0.6.2"
 zeroize = "1.8.1"
 
-matrix-sdk = { path = "crates/matrix-sdk", version = "0.10.0", default-features = false }
-matrix-sdk-base = { path = "crates/matrix-sdk-base", version = "0.10.0" }
-matrix-sdk-common = { path = "crates/matrix-sdk-common", version = "0.10.0" }
-matrix-sdk-crypto = { path = "crates/matrix-sdk-crypto", version = "0.10.0" }
+matrix-sdk = { path = "crates/matrix-sdk", version = "0.11.0", default-features = false }
+matrix-sdk-base = { path = "crates/matrix-sdk-base", version = "0.11.0" }
+matrix-sdk-common = { path = "crates/matrix-sdk-common", version = "0.11.0" }
+matrix-sdk-crypto = { path = "crates/matrix-sdk-crypto", version = "0.11.0" }
 matrix-sdk-ffi-macros = { path = "bindings/matrix-sdk-ffi-macros", version = "0.7.0" }
-matrix-sdk-indexeddb = { path = "crates/matrix-sdk-indexeddb", version = "0.10.0", default-features = false }
-matrix-sdk-qrcode = { path = "crates/matrix-sdk-qrcode", version = "0.10.0" }
-matrix-sdk-sqlite = { path = "crates/matrix-sdk-sqlite", version = "0.10.0", default-features = false }
-matrix-sdk-store-encryption = { path = "crates/matrix-sdk-store-encryption", version = "0.10.0" }
-matrix-sdk-test = { path = "testing/matrix-sdk-test", version = "0.10.0" }
-matrix-sdk-ui = { path = "crates/matrix-sdk-ui", version = "0.10.0", default-features = false }
+matrix-sdk-indexeddb = { path = "crates/matrix-sdk-indexeddb", version = "0.11.0", default-features = false }
+matrix-sdk-qrcode = { path = "crates/matrix-sdk-qrcode", version = "0.11.0" }
+matrix-sdk-sqlite = { path = "crates/matrix-sdk-sqlite", version = "0.11.0", default-features = false }
+matrix-sdk-store-encryption = { path = "crates/matrix-sdk-store-encryption", version = "0.11.0" }
+matrix-sdk-test = { path = "testing/matrix-sdk-test", version = "0.11.0" }
+matrix-sdk-ui = { path = "crates/matrix-sdk-ui", version = "0.11.0", default-features = false }
 
 # Default development profile; default for most Cargo commands, otherwise
 # selected with `--debug`

Cargo.toml

@@ -13,35 +13,36 @@ The procedure is as follows:
 
 1. Switch to a release branch:
 
-  ```bash
-  git switch -c release-x.y.z
-  ```
+   ```bash
+   git switch -c release-x.y.z
+   ```
 
 2. Prepare the release. This will update the `README.md`, set the versions in
    the `CHANGELOG.md` file, and bump the version in the `Cargo.toml` file.
 
-```bash
-cargo xtask release prepare --execute minor|patch|rc
-```
+   ```bash
+   cargo xtask release prepare --execute minor|patch|rc
+   ```
 
 3. Double-check and edit the `CHANGELOG.md` and `README.md` if necessary. Once you are
    satisfied, push the branch and open a PR.
 
-```bash
-git push --set-upstream origin/release-x.y.z
-```
+   ```bash
+   git push --set-upstream origin/release-x.y.z
+   ```
 
 4. Pass the review and merge the branch as you would with any other branch.
 
 5. Create tags for your new release, publish the release on crates.io and push
    the tags:
 
-```bash
-# Switch to main first.
-git switch main
-# Pull in the now-merged release commit(s).
-git pull
-# Create tags, publish the release on crates.io, and push the tags.
-cargo xtask release publish --execute
-```
-For more information on cargo-release: https://github.com/crate-ci/cargo-release
+   ```bash
+   # Switch to main first.
+   git switch main
+   # Pull in the now-merged release commit(s).
+   git pull
+   # Create tags, publish the release on crates.io, and push the tags.
+   cargo xtask release publish --execute
+   ```
+
+   For more information on cargo-release: https://github.com/crate-ci/cargo-release

RELEASING.md

@@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] - ReleaseDate
 
+## [0.11.0] - 2025-04-11
+
 Breaking changes:
 
 - `TracingConfiguration` now includes a new field `trace_log_packs`, which gives a convenient way

bindings/matrix-sdk-ffi/CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "matrix-sdk-ffi"
-version = "0.2.0"
+version = "0.11.0"
 edition = "2021"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"
 keywords = ["matrix", "chat", "messaging", "ffi"]

bindings/matrix-sdk-ffi/Cargo.toml

@@ -5,7 +5,11 @@ use matrix_sdk_ui::notification_client::{
 };
 use ruma::{EventId, RoomId};
 
-use crate::{client::Client, error::ClientError, event::TimelineEvent};
+use crate::{
+    client::{Client, JoinRule},
+    error::ClientError,
+    event::TimelineEvent,
+};
 
 #[derive(uniffi::Enum)]
 pub enum NotificationEvent {
@@ -25,9 +29,11 @@ pub struct NotificationRoomInfo {
     pub display_name: String,
     pub avatar_url: Option<String>,
     pub canonical_alias: Option<String>,
+    pub join_rule: Option<JoinRule>,
     pub joined_members_count: u64,
     pub is_encrypted: Option<bool>,
     pub is_direct: bool,
+    pub is_public: bool,
 }
 
 #[derive(uniffi::Record)]
@@ -66,9 +72,11 @@ impl NotificationItem {
                 display_name: item.room_computed_display_name,
                 avatar_url: item.room_avatar_url,
                 canonical_alias: item.room_canonical_alias,
+                join_rule: item.room_join_rule.try_into().ok(),
                 joined_members_count: item.joined_members_count,
                 is_encrypted: item.is_room_encrypted,
                 is_direct: item.is_direct_message_room,
+                is_public: item.is_room_public,
             },
             is_noisy: item.is_noisy,
             has_mention: item.has_mention,

bindings/matrix-sdk-ffi/src/notification.rs

@@ -6,10 +6,13 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] - ReleaseDate
 
+## [0.11.0] - 2025-04-11
+
 ### Features
 
-- [**breaking**] The `Client::subscribe_to_ignore_user_list_changes()` method will now only trigger
-  whenever the ignored user list has changed from what was previously known, instead of triggering
+- [**breaking**] The `Client::subscribe_to_ignore_user_list_changes()`
+  method will now only trigger whenever the ignored user list has
+  changed from what was previously known, instead of triggering
   every time an ignore-user-list event has been received from sync.
   ([#4779](https://github.com/matrix-org/matrix-rust-sdk/pull/4779))
 - [**breaking**] The `MediaRetentionPolicy` can now trigger regular cleanups

crates/matrix-sdk-base/CHANGELOG.md

@@ -9,7 +9,7 @@ name = "matrix-sdk-base"
 readme = "README.md"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"
 rust-version = { workspace = true }
-version = "0.10.0"
+version = "0.11.0"
 
 [package.metadata.docs.rs]
 all-features = true