mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-16 03:55:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: get rid of Client::inherit_session

Browse Source 
It does the same as `restore_session` now. Thanks @zecakeh for finding this out!
This commit is contained in:
Benjamin Bouvier
2023-08-03 11:26:45 +02:00
parent 61d4d5b096
commit bf754667d9
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/matrix-sdk/src/client/mod.rs
View File

@@ -1987,13 +1987,9 @@ impl Client {
)),
};
// Now inherit the session without restarting the crypto machine.
// Copy the parent's session into the child.
if let Some(session) = self.session() {
match session {
AuthSession::Matrix(s) => {
client.matrix_auth().inherit_session(s).await?;
}
}
client.restore_session(session).await?;
}
Ok(client)

12
crates/matrix-sdk/src/matrix_auth/mod.rs
View File

@@ -798,20 +798,8 @@ impl MatrixAuth {
#[instrument(skip_all)]
pub async fn restore_session(&self, session: Session) -> Result<()> {
debug!("Restoring Matrix auth session");
self.set_session(session).await?;
debug!("Done restoring Matrix auth session");
Ok(())
}
/// Same as [`Self::restore_session`], but doesn't regenerate the Olm
/// machine automatically.
pub(crate) async fn inherit_session(&self, session: Session) -> Result<()> {
debug!("Inheriting Matrix auth session");
self.set_session(session).await?;
debug!("Done inheriting Matrix auth session");
Ok(())
}