filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-04 13:07:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

stable name for withheld

Browse Source
This commit is contained in:
Valere 2022-07-12 09:30:43 +02:00
parent 6b0f8318b7
commit 7a3f2bb240
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Stop using unstable names for withheld codes

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
View File

@ -87,7 +87,7 @@ object EventType {
// Key share events // Key share events
const val ROOM_KEY_REQUEST = "m.room_key_request" const val ROOM_KEY_REQUEST = "m.room_key_request"
const val FORWARDED_ROOM_KEY = "m.forwarded_room_key" const val FORWARDED_ROOM_KEY = "m.forwarded_room_key"
const val ROOM_KEY_WITHHELD = "org.matrix.room_key.withheld" val ROOM_KEY_WITHHELD = listOf("m.room_key.withheld", "org.matrix.room_key.withheld")
const val REQUEST_SECRET = "m.secret.request" const val REQUEST_SECRET = "m.secret.request"
const val SEND_SECRET = "m.secret.send" const val SEND_SECRET = "m.secret.send"

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
View File

@ -820,7 +820,7 @@ internal class DefaultCryptoService @Inject constructor(
EventType.SEND_SECRET -> { EventType.SEND_SECRET -> {
onSecretSendReceived(event) onSecretSendReceived(event)
} }
EventType.ROOM_KEY_WITHHELD -> { in EventType.ROOM_KEY_WITHHELD -> {
onKeyWithHeldReceived(event) onKeyWithHeldReceived(event)
} }
else -> { else -> {
@ -869,7 +869,7 @@ internal class DefaultCryptoService @Inject constructor(
senderKey = withHeldContent.senderKey, senderKey = withHeldContent.senderKey,
fromDevice = withHeldContent.fromDevice, fromDevice = withHeldContent.fromDevice,
event = Event( event = Event(
type = EventType.ROOM_KEY_WITHHELD, type = EventType.ROOM_KEY_WITHHELD.first(),
senderId = senderId, senderId = senderId,
content = event.getClearContent() content = event.getClearContent()
) )

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingKeyRequestManager.kt
View File

@ -315,7 +315,7 @@ internal class IncomingKeyRequestManager @Inject constructor(
) )
val params = SendToDeviceTask.Params( val params = SendToDeviceTask.Params(
EventType.ROOM_KEY_WITHHELD, EventType.ROOM_KEY_WITHHELD.first(),
MXUsersDevicesMap<Any>().apply { MXUsersDevicesMap<Any>().apply {
setObject(request.requestingUserId, request.requestingDeviceId, withHeldContent) setObject(request.requestingUserId, request.requestingDeviceId, withHeldContent)
} }

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
View File

@ -365,7 +365,7 @@ internal class MXMegolmEncryption(
fromDevice = myDeviceId fromDevice = myDeviceId
) )
val params = SendToDeviceTask.Params( val params = SendToDeviceTask.Params(
EventType.ROOM_KEY_WITHHELD, EventType.ROOM_KEY_WITHHELD.first(),
MXUsersDevicesMap<Any>().apply { MXUsersDevicesMap<Any>().apply {
targets.forEach { targets.forEach {
setObject(it.userId, it.deviceId, withHeldContent) setObject(it.userId, it.deviceId, withHeldContent)

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingKeyRequestEntity.kt
View File

@ -117,7 +117,7 @@ internal open class OutgoingKeyRequestEntity(
private fun eventToResult(event: Event): RequestResult? { private fun eventToResult(event: Event): RequestResult? {
return when (event.getClearType()) { return when (event.getClearType()) {
EventType.ROOM_KEY_WITHHELD -> { in EventType.ROOM_KEY_WITHHELD -> {
event.content.toModel<RoomKeyWithHeldContent>()?.code?.let { event.content.toModel<RoomKeyWithHeldContent>()?.code?.let {
RequestResult.Failure(it) RequestResult.Failure(it)
} }