From e37f65c46bd5ce39fa08d3bb1582a364850d1a4c Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 17 Jul 2024 16:57:40 +0100 Subject: [PATCH] ffi: Allow restoring an existing session with SSS enabled. --- bindings/matrix-sdk-ffi/src/client.rs | 10 ++++++---- crates/matrix-sdk/src/client/mod.rs | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bindings/matrix-sdk-ffi/src/client.rs b/bindings/matrix-sdk-ffi/src/client.rs index 0ddfbe29d..7d71473a0 100644 --- a/bindings/matrix-sdk-ffi/src/client.rs +++ b/bindings/matrix-sdk-ffi/src/client.rs @@ -388,11 +388,13 @@ impl Client { self.restore_session_inner(auth_session).await?; - if let Some(sliding_sync_proxy) = sliding_sync_proxy { - let sliding_sync_proxy = Url::parse(&sliding_sync_proxy) - .map_err(|error| ClientError::Generic { msg: error.to_string() })?; + if !self.inner.is_simplified_sliding_sync_enabled() { + if let Some(sliding_sync_proxy) = sliding_sync_proxy { + let sliding_sync_proxy = Url::parse(&sliding_sync_proxy) + .map_err(|error| ClientError::Generic { msg: error.to_string() })?; - self.inner.set_sliding_sync_proxy(Some(sliding_sync_proxy)); + self.inner.set_sliding_sync_proxy(Some(sliding_sync_proxy)); + } } Ok(()) diff --git a/crates/matrix-sdk/src/client/mod.rs b/crates/matrix-sdk/src/client/mod.rs index afb1327f2..0fe65251d 100644 --- a/crates/matrix-sdk/src/client/mod.rs +++ b/crates/matrix-sdk/src/client/mod.rs @@ -482,7 +482,7 @@ impl Client { /// Check whether Simplified MSC3575 must be used. #[cfg(feature = "experimental-sliding-sync")] - pub(crate) fn is_simplified_sliding_sync_enabled(&self) -> bool { + pub fn is_simplified_sliding_sync_enabled(&self) -> bool { self.inner.is_simplified_sliding_sync_enabled }