From 11dffacc485e196baa9a3a71a7f4eab4e7a980ca Mon Sep 17 00:00:00 2001 From: Onuray Sahin Date: Mon, 8 Feb 2021 17:39:25 +0300 Subject: [PATCH] Code review fixes. --- .../android/sdk/internal/crypto/DefaultCryptoService.kt | 6 +----- .../crypto/keysrequest/OutboundSessionKeySharingStrategy.kt | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt index 14542a1ea8..08991b2d5f 100755 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt @@ -1300,11 +1300,7 @@ internal class DefaultCryptoService @Inject constructor( override fun ensureOutboundSession(roomId: String) { cryptoCoroutineScope.launch(coroutineDispatchers.crypto) { // Ensure to load all room members - loadRoomMembersTask - .configureWith(LoadRoomMembersTask.Params(roomId)) { - this.callback = NoOpMatrixCallback() - } - .executeBy(taskExecutor) + loadRoomMembersTask.execute(LoadRoomMembersTask.Params(roomId)) val userIds = getRoomUserIds(roomId) val alg = roomEncryptorsStore.get(roomId) diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt index e797f4622c..19c62ed572 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 The Matrix.org Foundation C.I.C. + * Copyright (c) 2021 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.