mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-21 21:54:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request from timokoesters/fix-parsing-servername

Browse source 
fix: make cross signing work with server names containing :
This commit is contained in:
Benoit Marty 2021-03-16 14:46:47 +01:00 • committed by GitHub
commit 4273a6a1be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
CHANGES.md
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto
DeviceListManager.kt

1
CHANGES.md
View file

@ -48,6 +48,7 @@ Bugfix 🐛:
- Be robust if Event.type is missing (#2946) - Be robust if Event.type is missing (#2946)
- Snappier message send status - Snappier message send status
- Fix MainActivity display (#2927) - Fix MainActivity display (#2927)
- Cross signing now works with servers with an explicit port in the servername
Translations 🗣: Translations 🗣:
- All string resources and translations have been moved to the application module. Weblate project for the SDK will be removed. - All string resources and translations have been moved to the application module. Weblate project for the SDK will be removed.

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
View file

@ -108,7 +108,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
if (':' in userId) { if (':' in userId) {
try { try {
synchronized(notReadyToRetryHS) { synchronized(notReadyToRetryHS) {
res = !notReadyToRetryHS.contains(userId.substringAfterLast(':')) res = !notReadyToRetryHS.contains(userId.substringAfter(':'))
} }
} catch (e: Exception) { } catch (e: Exception) {
Timber.e(e, "## CRYPTO | canRetryKeysDownload() failed") Timber.e(e, "## CRYPTO | canRetryKeysDownload() failed")