matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-07 23:02:56 +03:00
Code Activity

Bump dependency on rust-sdk-crypto-wasm to v8.0.0 (#4396)

Browse Source
This commit is contained in:
Hubert Chathi
2024-09-13 05:22:33 -04:00
committed by GitHub
parent 60cedf2fdb
commit 7987ce76ec
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rust-crypto/RoomEncryptor.ts
View File

@@ -254,9 +254,9 @@ export class RoomEncryptor {
// When this.room.getBlacklistUnverifiedDevices() === null, the global settings should be used
// See Room#getBlacklistUnverifiedDevices
if (this.room.getBlacklistUnverifiedDevices() ?? globalBlacklistUnverifiedDevices) {
rustEncryptionSettings.sharingStrategy = CollectStrategy.DeviceBasedStrategyOnlyTrustedDevices;
rustEncryptionSettings.sharingStrategy = CollectStrategy.deviceBasedStrategy(true, false);
} else {
rustEncryptionSettings.sharingStrategy = CollectStrategy.DeviceBasedStrategyAllDevices;
rustEncryptionSettings.sharingStrategy = CollectStrategy.deviceBasedStrategy(false, false);
}
await logDuration(this.prefixedLogger, "shareRoomKey", async () => {

1
src/rust-crypto/rust-crypto.ts
View File

@@ -1741,6 +1741,7 @@ class EventDecryptor {
const res = (await this.olmMachine.decryptRoomEvent(
stringifyEvent(event),
new RustSdkCryptoJs.RoomId(event.getRoomId()!),
new RustSdkCryptoJs.DecryptionSettings(RustSdkCryptoJs.TrustRequirement.Untrusted),
)) as RustSdkCryptoJs.DecryptedRoomEvent;
// Success. We can remove the event from the pending list, if