mirror of
https://github.com/element-hq/element-android
synced 2024-11-27 11:59:12 +03:00
fix: make cross signing work with server names containing :
Server names are allowed to contain ':' to specify a port, see https://matrix.org/docs/spec/appendices#server-name User ids on the other hand are not allowed to contain ':', even historical user ids, see https://matrix.org/docs/spec/appendices#historical-user-ids Therefore we can use the first instance of ':' to split the user localpart from the server name.
This commit is contained in:
parent
e8d4fab305
commit
dd2a7397a4
2 changed files with 2 additions and 1 deletions
|
@ -47,6 +47,7 @@ Bugfix 🐛:
|
|||
- Be robust if Event.type is missing (#2946)
|
||||
- Snappier message send status
|
||||
- Fix MainActivity display (#2927)
|
||||
- Cross signing now works with servers with an explicit port in the servername
|
||||
|
||||
Translations 🗣:
|
||||
- All string resources and translations have been moved to the application module. Weblate project for the SDK will be removed.
|
||||
|
|
|
@ -104,7 +104,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
|
|||
if (':' in userId) {
|
||||
try {
|
||||
synchronized(notReadyToRetryHS) {
|
||||
res = !notReadyToRetryHS.contains(userId.substringAfterLast(':'))
|
||||
res = !notReadyToRetryHS.contains(userId.substringAfter(':'))
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
Timber.e(e, "## CRYPTO | canRetryKeysDownload() failed")
|
||||
|
|
Loading…
Reference in a new issue