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

Fix fallback otk support

This commit is contained in:
Valere 2021-11-10 16:55:34 +01:00
parent 474e2aadbe
commit 5b76d4b682
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4446.bugfix Normal file
View File

@ -0,0 +1 @@
Unable to establish Olm outbound session from fallback key

12
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXKey.kt
View File

@ -38,14 +38,18 @@ data class MXKey(
/** /**
* signature user Id to [deviceid][signature] * signature user Id to [deviceid][signature]
*/ */
private val signatures: Map<String, Map<String, String>> private val signatures: Map<String, Map<String, String>>,
private val rawMap: JsonDict
) { ) {
/** /**
* @return the signed data map * @return the signed data map
*/ */
fun signalableJSONDictionary(): Map<String, Any> { fun signalableJSONDictionary(): Map<String, Any> {
return mapOf("key" to value) return rawMap.filter {
it.key != "signatures" && it.key != "unsigned"
}
} }
/** /**
@ -82,6 +86,7 @@ data class MXKey(
* <pre> * <pre>
* "signed_curve25519:AAAAFw": { * "signed_curve25519:AAAAFw": {
* "key": "IjwIcskng7YjYcn0tS8TUOT2OHHtBSfMpcfIczCgXj4", * "key": "IjwIcskng7YjYcn0tS8TUOT2OHHtBSfMpcfIczCgXj4",
* "fallback" : true|false
* "signatures": { * "signatures": {
* "@userId:matrix.org": { * "@userId:matrix.org": {
* "ed25519:GMJRREOASV": "EUjp6pXzK9u3SDFR\/qLbzpOi3bEREeI6qMnKzXu992HsfuDDZftfJfiUXv9b\/Hqq1og4qM\/vCQJGTHAWMmgkCg" * "ed25519:GMJRREOASV": "EUjp6pXzK9u3SDFR\/qLbzpOi3bEREeI6qMnKzXu992HsfuDDZftfJfiUXv9b\/Hqq1og4qM\/vCQJGTHAWMmgkCg"
@ -107,7 +112,8 @@ data class MXKey(
type = components[0], type = components[0],
keyId = components[1], keyId = components[1],
value = params["key"] as String, value = params["key"] as String,
signatures = params["signatures"] as Map<String, Map<String, String>> signatures = params["signatures"] as Map<String, Map<String, String>>,
rawMap = params
) )
} }
} }