Skip to content

Stop overriding the homeserver when restoring a Client #5753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmartinesp merged 1 commit into from
Nov 18, 2025
Merged

Stop overriding the homeserver when restoring a Client #5753

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion .../impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ class RustMatrixClientFactory(
passphrase = sessionData.passphrase,
slidingSyncType = ClientBuilderSlidingSync.Restored,
)
.homeserverUrl(sessionData.homeserverUrl)
Copy link
Member

@bmarty bmarty Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix!
So it seems that the application is storing the actual homeserver Url (CS baseUrl) and this is not really expected. I was looking at the other usage of homeserverUrl (to see if it could be just removed) and I see that the only other usage of homeserverUrl is here, and toSession is invoked at line 73 below.

So it is actually OK that the CS baseUrl is stored?

Copy link
Member

@bmarty bmarty Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other usage is actually not used by the SDK. Maybe some cleanup can be done SDK side later.

Copy link
Member Author

@jmartinesp jmartinesp Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other usage is actually not used by the SDK. Maybe some cleanup can be done SDK side later.

This was implemented in matrix-org/matrix-rust-sdk#5874.

.username(sessionData.userId)
.use { it.build() }

Expand Down
Loading