Skip to content

Commit a015eda

Browse files
committed
code review
1 parent 87df8ab commit a015eda

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ class Rendezvous(
218218
Timber.tag(TAG).i("No master key given by verifying device")
219219
}
220220

221-
// request secrets from the verifying device
222-
Timber.tag(TAG).i("Requesting secrets from $verifyingDeviceId")
221+
// request secrets from other sessions.
222+
Timber.tag(TAG).i("Requesting secrets from other sessions")
223223

224224
session.sharedSecretStorageService().requestMissingSecrets()
225225
} else {

matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/SecretShareManager.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,9 @@ internal class SecretShareManager @Inject constructor(
2828
private val outgoingRequestsProcessor: OutgoingRequestsProcessor) {
2929

3030
suspend fun requestSecretTo(deviceId: String, secretName: String) {
31-
Timber.v("SecretShareManager requesting $deviceId, $secretName")
32-
if (this.olmMachine.get().requestMissingSecretsFromOtherSessions()) {
33-
// immediately send the requests
34-
outgoingRequestsProcessor.processOutgoingRequests(this.olmMachine.get()) {
35-
it is Request.ToDevice && it.eventType == EventType.REQUEST_SECRET
36-
}
37-
}
31+
Timber.w("SecretShareManager requesting custom secrets not supported $deviceId, $secretName")
32+
// rust stack only support requesting secrets defined in the spec (not custom secret yet)
33+
requestMissingSecrets()
3834
}
3935

4036
suspend fun requestMissingSecrets() {

0 commit comments

Comments
 (0)