Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ rand = "0.8.5"
regex = "1.11.2"
reqwest = { version = "0.12.23", default-features = false }
rmp-serde = "1.3.0"
ruma = { version = "0.13.0", features = [
# TODO: revert this before merging
ruma = { git = "https://github.com/jmartinesp/ruma", rev = "0dac817a7a3b4c08993ab275c47033d8f797a3f3", features = [
"client-api-c",
"compat-upload-signatures",
"compat-arbitrary-length-ids",
Expand Down
6 changes: 4 additions & 2 deletions bindings/matrix-sdk-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ crate-type = [
]

[features]
default = ["bundled-sqlite", "unstable-msc4274"]
default = ["bundled-sqlite", "unstable-msc4274", "unstable-msc4076"]
bundled-sqlite = ["matrix-sdk/bundled-sqlite"]
unstable-msc4274 = ["matrix-sdk-ui/unstable-msc4274"]
# Required when targeting a Javascript environment, like Wasm in a browser.
Expand All @@ -36,6 +36,8 @@ rustls-tls = ["matrix-sdk/rustls-tls", "sentry?/rustls"]
# Enable sentry error monitoring, not compatible with Wasm platforms.
sentry = ["dep:sentry", "dep:sentry-tracing"]

unstable-msc4076 = ["matrix-sdk/unstable-msc4076"]

[dependencies]
anyhow.workspace = true
extension-trait = "1.0.1"
Expand All @@ -57,7 +59,7 @@ matrix-sdk-ffi-macros.workspace = true
matrix-sdk-ui = { workspace = true, features = ["uniffi"] }
mime = "0.3.16"
once_cell.workspace = true
ruma = { workspace = true, features = ["html", "unstable-msc3488", "compat-unset-avatar", "unstable-msc3245-v1-compat", "unstable-msc4278", "unstable-hydra"] }
ruma = { workspace = true, features = ["html", "unstable-msc3488", "compat-unset-avatar", "unstable-msc3245-v1-compat", "unstable-msc4278", "unstable-hydra", "unstable-msc4076"] }
serde.workspace = true
serde_json.workspace = true
sentry = { workspace = true, optional = true, default-features = false, features = [
Expand Down
4 changes: 4 additions & 0 deletions bindings/matrix-sdk-ffi/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1144,6 +1144,7 @@ impl Client {
}

/// Registers a pusher with given parameters
#[allow(clippy::too_many_arguments)]
pub async fn set_pusher(
&self,
identifiers: PusherIdentifiers,
Expand All @@ -1152,6 +1153,7 @@ impl Client {
device_display_name: String,
profile_tag: Option<String>,
lang: String,
#[cfg(feature = "unstable-msc4076")] disable_badge_count: bool,
) -> Result<(), ClientError> {
let ids = identifiers.into();

Expand All @@ -1162,6 +1164,8 @@ impl Client {
device_display_name,
profile_tag,
lang,
#[cfg(feature = "unstable-msc4076")]
disable_badge_count,
};
self.inner.pusher().set(pusher_init.into()).await?;
Ok(())
Expand Down
3 changes: 3 additions & 0 deletions crates/matrix-sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ docsrs = ["e2e-encryption", "sqlite", "indexeddb", "sso-login", "qrcode"]
# Add support for inline media galleries via msgtypes
unstable-msc4274 = ["ruma/unstable-msc4274", "matrix-sdk-base/unstable-msc4274"]

# Add support for disabling the pusher badge count
unstable-msc4076 = ["ruma/unstable-msc4076"]

experimental-search = ["matrix-sdk-search"]

[dependencies]
Expand Down
2 changes: 2 additions & 0 deletions crates/matrix-sdk/src/pusher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ mod tests {
lang: "EN".to_owned(),
device_display_name: "name".to_owned(),
profile_tag: None,
#[cfg(feature = "unstable-msc4076")]
disable_badge_count: true,
};

let response = client.pusher().set(pusher.into()).await;
Expand Down
2 changes: 1 addition & 1 deletion xtask/src/ci.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ fn check_clippy() -> Result<()> {
"rustup run {NIGHTLY} cargo clippy --workspace --all-targets
--exclude matrix-sdk-crypto --exclude xtask
--no-default-features
--features native-tls,sso-login,testing
--features native-tls,sso-login,testing,unstable-msc4076
-- -D warnings"
)
.run()?;
Expand Down
Loading