From c91bc82cd97490fc31561fd04a445c051665ac2c Mon Sep 17 00:00:00 2001 From: Valere Date: Fri, 3 Apr 2020 13:35:09 +0200 Subject: [PATCH] Fix / Ensure encryption set even if faield to fetch members --- .../matrix/android/internal/crypto/DefaultCryptoService.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt index d0a08b17ab..d3e5ada8cb 100755 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt @@ -792,10 +792,11 @@ internal class DefaultCryptoService @Inject constructor( val params = LoadRoomMembersTask.Params(roomId) try { loadRoomMembersTask.execute(params) - val userIds = getRoomUserIds(roomId) - setEncryptionInRoom(roomId, event.content?.get("algorithm")?.toString(), true, userIds) } catch (throwable: Throwable) { Timber.e(throwable, "## onRoomEncryptionEvent ERROR FAILED TO SETUP CRYPTO ") + } finally { + val userIds = getRoomUserIds(roomId) + setEncryptionInRoom(roomId, event.content?.get("algorithm")?.toString(), true, userIds) } } }