Skip to content

Commit c9620aa

Browse files
committed
crypto: fix room key reply
1 parent 92e84bc commit c9620aa

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

sdn-sdk-android/src/main/java/org/sdn/android/sdk/internal/crypto/IncomingKeyRequestManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ internal class IncomingKeyRequestManager @Inject constructor(
492492
sendToDeviceMap.setObject(validRequest.requestingUserId, validRequest.requestingDeviceId, encryptedPayload)
493493
Timber.tag(loggerTag.value).d(
494494
"directShareMegolmKey() : try sending session ${validRequest.sessionId} to ${validRequest.requestingUserId} | ${validRequest.requestingDeviceId}")
495-
val sendToDeviceParams = SendToDeviceTask.Params(EventType.ENCRYPTED, sendToDeviceMap)
495+
val sendToDeviceParams = SendToDeviceTask.Params(EventType.ROOM_KEY_REPLY, sendToDeviceMap)
496496
return try {
497497
sendToDeviceTask.execute(sendToDeviceParams)
498498
Timber.tag(loggerTag.value)

sdn-sdk-android/src/main/java/org/sdn/android/sdk/internal/session/sync/handler/CryptoSyncHandler.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ internal class CryptoSyncHandler @Inject constructor(
9595
*/
9696
private suspend fun decryptToDeviceEvent(event: Event, timelineId: String?): Boolean {
9797
Timber.v("## CRYPTO | decryptToDeviceEvent")
98-
if (event.getClearType() == EventType.ENCRYPTED) {
98+
val eventType = event.getClearType()
99+
if (eventType == EventType.ENCRYPTED || eventType == EventType.ROOM_KEY_REPLY) {
99100
var result: MXEventDecryptionResult? = null
100101
try {
101102
result = cryptoService.decryptEvent(event, timelineId ?: "")

0 commit comments

Comments
 (0)