filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post merge conflict reformatting

This commit is contained in:
ericdecanini 2022-05-25 17:35:54 +02:00
parent 8647400dda
commit 927f526c6c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
View File

@ -764,12 +764,14 @@ internal class MXOlmDevice @Inject constructor(
* @return the decrypting result. Null if the sessionId is unknown. * @return the decrypting result. Null if the sessionId is unknown.
*/ */
@Throws(MXCryptoError::class) @Throws(MXCryptoError::class)
suspend fun decryptGroupMessage(body: String, suspend fun decryptGroupMessage(
roomId: String, body: String,
timeline: String?, roomId: String,
eventId: String, timeline: String?,
sessionId: String, eventId: String,
senderKey: String): OlmDecryptionResult { sessionId: String,
senderKey: String
): OlmDecryptionResult {
val sessionHolder = getInboundGroupSession(sessionId, senderKey, roomId) val sessionHolder = getInboundGroupSession(sessionId, senderKey, roomId)
val wrapper = sessionHolder.wrapper val wrapper = sessionHolder.wrapper
val inboundGroupSession = wrapper.olmInboundGroupSession val inboundGroupSession = wrapper.olmInboundGroupSession