jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3760 from vector-im/feature/bma/otk1 

2 small fixes
This commit is contained in:
Benoit Marty 2021-07-30 12:55:57 +02:00 committed by GitHub
parent 25f25b0e95 a7e3c0d0d8
commit 7cd90b0b14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt
View File

@ -49,6 +49,8 @@ internal class DefaultSessionCreator @Inject constructor(
// remove trailing "/"
?.trim { it == '/' }
?.takeIf { it.isNotBlank() }
// It can be the same value, so in this case, do not check again the validity
?.takeIf { it != homeServerConnectionConfig.homeServerUriBase.toString() }
?.also { Timber.d("Overriding homeserver url to $it (will check if valid)") }
?.let { Uri.parse(it) }
?.takeIf {

2
vector/src/main/res/values/strings.xml
View File

@ -2871,7 +2871,7 @@
One of the following may be compromised:\n\n- Your password\n- Your homeserver\n- This device, or the other device\n- The internet connection either device is using\n\nWe recommend you change your password & recovery key in Settings immediately.
</string>
<string name="verify_cancelled_notice">Verify your devices from Settings.</string>
<string name="verify_cancelled_notice">Verification has been cancelled. You can start verification again.</string>
<string name="verification_cancelled">Verification Cancelled</string>
<string name="recovery_passphrase">Recovery Passphrase</string>