Merge branch 'krille/cant-send-messages-without-encryption' into 'main'

feat: Let sendDefaultMessage return false on encryption failure

See merge request famedly/company/frontend/famedlysdk!931
This commit is contained in:
td 2022-01-07 17:12:20 +00:00
commit 44f3d35910
1 changed files with 3 additions and 7 deletions

View File

@ -1300,12 +1300,6 @@ class Room {
room: this); room: this);
setState(user); setState(user);
await client.database?.transaction(() async { await client.database?.transaction(() async {
final content = <String, dynamic>{
'sender': mxID,
'type': EventTypes.RoomMember,
'content': resp,
'state_key': mxID,
};
final fakeEventId = String.fromCharCodes( final fakeEventId = String.fromCharCodes(
await sha256( await sha256(
Uint8List.fromList( Uint8List.fromList(
@ -1407,7 +1401,9 @@ class Room {
bool get canBan => _hasPermissionFor('ban'); bool get canBan => _hasPermissionFor('ban');
/// The default level required to send message events. Can be overridden by the events key. /// The default level required to send message events. Can be overridden by the events key.
bool get canSendDefaultMessages => _hasPermissionFor('events_default'); bool get canSendDefaultMessages =>
_hasPermissionFor('events_default') &&
(!encrypted || client.encryptionEnabled);
/// The level required to invite a user. /// The level required to invite a user.
bool get canInvite => _hasPermissionFor('invite'); bool get canInvite => _hasPermissionFor('invite');