Post merge conflict reformatting

2022-05-25 17:35:54 +02:00 · 2022-05-25 17:35:54 +02:00 · 927f526c6c
commit 927f526c6c
parent 8647400dda
1 changed files with 8 additions and 6 deletions
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
@ -764,12 +764,14 @@ internal class MXOlmDevice @Inject constructor(
     * @return the decrypting result. Null if the sessionId is unknown.
     */
    @Throws(MXCryptoError::class)
-    suspend fun decryptGroupMessage(body: String,
-                                    roomId: String,
-                                    timeline: String?,
-                                    eventId: String,
-                                    sessionId: String,
-                                    senderKey: String): OlmDecryptionResult {
+    suspend fun decryptGroupMessage(
+            body: String,
+            roomId: String,
+            timeline: String?,
+            eventId: String,
+            sessionId: String,
+            senderKey: String
+    ): OlmDecryptionResult {
        val sessionHolder = getInboundGroupSession(sessionId, senderKey, roomId)
        val wrapper = sessionHolder.wrapper
        val inboundGroupSession = wrapper.olmInboundGroupSession