File tree 4 files changed +8
-7
lines changed
4 files changed +8
-7
lines changed Original file line number Diff line number Diff line change 50
50
],
51
51
"dependencies" : {
52
52
"@babel/runtime" : " ^7.12.5" ,
53
- "@matrix-org/matrix-sdk-crypto-wasm" : " ^7 .0.0" ,
53
+ "@matrix-org/matrix-sdk-crypto-wasm" : " ^8 .0.0" ,
54
54
"@matrix-org/olm" : " 3.2.15" ,
55
55
"another-json" : " ^0.2.0" ,
56
56
"bs58" : " ^6.0.0" ,
Original file line number Diff line number Diff line change @@ -254,9 +254,9 @@ export class RoomEncryptor {
254
254
// When this.room.getBlacklistUnverifiedDevices() === null, the global settings should be used
255
255
// See Room#getBlacklistUnverifiedDevices
256
256
if ( this . room . getBlacklistUnverifiedDevices ( ) ?? globalBlacklistUnverifiedDevices ) {
257
- rustEncryptionSettings . sharingStrategy = CollectStrategy . DeviceBasedStrategyOnlyTrustedDevices ;
257
+ rustEncryptionSettings . sharingStrategy = CollectStrategy . deviceBasedStrategy ( true , false ) ;
258
258
} else {
259
- rustEncryptionSettings . sharingStrategy = CollectStrategy . DeviceBasedStrategyAllDevices ;
259
+ rustEncryptionSettings . sharingStrategy = CollectStrategy . deviceBasedStrategy ( false , false ) ;
260
260
}
261
261
262
262
await logDuration ( this . prefixedLogger , "shareRoomKey" , async ( ) => {
Original file line number Diff line number Diff line change @@ -1741,6 +1741,7 @@ class EventDecryptor {
1741
1741
const res = ( await this . olmMachine . decryptRoomEvent (
1742
1742
stringifyEvent ( event ) ,
1743
1743
new RustSdkCryptoJs . RoomId ( event . getRoomId ( ) ! ) ,
1744
+ new RustSdkCryptoJs . DecryptionSettings ( RustSdkCryptoJs . TrustRequirement . Untrusted ) ,
1744
1745
) ) as RustSdkCryptoJs . DecryptedRoomEvent ;
1745
1746
1746
1747
// Success. We can remove the event from the pending list, if
Original file line number Diff line number Diff line change 1453
1453
" @jridgewell/resolve-uri" " ^3.1.0"
1454
1454
" @jridgewell/sourcemap-codec" " ^1.4.14"
1455
1455
1456
- " @matrix-org/matrix-sdk-crypto-wasm@^7 .0.0 " :
1457
- version "7 .0.0"
1458
- resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-7 .0.0.tgz#8d6abdb9ded8656cc9e2a7909913a34bf3fc9b3a "
1459
- integrity sha512-MOencXiW/gI5MuTtCNsuojjwT5DXCrjMqv9xOslJC9h2tPdLFFFMGr58dY5Lis4DRd9MRWcgrGowUIHOqieWTA ==
1456
+ " @matrix-org/matrix-sdk-crypto-wasm@^8 .0.0 " :
1457
+ version "8 .0.0"
1458
+ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-8 .0.0.tgz#6ddc0e63538e821a2efbc5c1a2f0fa0f71d489ff "
1459
+ integrity sha512-s0q3O2dK8b6hOJ+SZFz+s/IiMabmVsNue6r17sTwbrRD8liBkCrpjYnxoMYvtC01GggJ9TZLQbeqpt8hQSPHAg ==
1460
1460
1461
1461
1462
1462
version "3.2.15"
You can’t perform that action at this time.
0 commit comments