OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'krille/fix-start-chat' into 'main' 

fix: Dont enable e2ee without encryption support

See merge request famedly/company/frontend/famedlysdk!893
This commit is contained in:
Nicolas Werner 2021-11-16 08:07:32 +00:00
parent 1804838324 c8c4562f70
commit ae5225f495
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/src/client.dart
View File

@ -568,7 +568,8 @@ class Client extends MatrixApi {
final directChatRoomId = getDirectChatFromUserId(mxid); final directChatRoomId = getDirectChatFromUserId(mxid);
if (directChatRoomId != null) return directChatRoomId; if (directChatRoomId != null) return directChatRoomId;
enableEncryption ??= await userOwnsEncryptionKeys(mxid); enableEncryption ??=
encryptionEnabled && await userOwnsEncryptionKeys(mxid);
if (enableEncryption) { if (enableEncryption) {
initialState ??= []; initialState ??= [];
if (!initialState.any((s) => s.type == EventTypes.Encryption)) { if (!initialState.any((s) => s.type == EventTypes.Encryption)) {
@ -609,6 +610,7 @@ class Client extends MatrixApi {
List<String>? invite, List<String>? invite,
CreateRoomPreset preset = CreateRoomPreset.privateChat, CreateRoomPreset preset = CreateRoomPreset.privateChat,
List<StateEvent>? initialState, List<StateEvent>? initialState,
Visibility? visibility,
bool waitForSync = true, bool waitForSync = true,
}) async { }) async {
enableEncryption ??= enableEncryption ??=
@ -629,6 +631,7 @@ class Client extends MatrixApi {
preset: preset, preset: preset,
name: groupName, name: groupName,
initialState: initialState, initialState: initialState,
visibility: visibility,
); );
if (waitForSync) { if (waitForSync) {