Merge branch 'krille/refactor-handle-rooms' into 'main'
chore: Add macOS libraries to gitignore See merge request famedly/company/frontend/famedlysdk!1067
This commit is contained in:
commit
48a376cdc0
|
|
@ -4,6 +4,7 @@
|
|||
*.pyc
|
||||
*.swp
|
||||
*.swo
|
||||
*.dylib
|
||||
.DS_Store
|
||||
.atom/
|
||||
.buildlog/
|
||||
|
|
|
|||
|
|
@ -1793,8 +1793,11 @@ class Client extends MatrixApi {
|
|||
// man-in-the-middle attacks!
|
||||
if ((event.type == EventTypes.Encryption &&
|
||||
room.encrypted &&
|
||||
event.content['algorithm'] !=
|
||||
room.getState(EventTypes.Encryption)?.content['algorithm'])) {
|
||||
event.content.tryGet<String>('algorithm') !=
|
||||
room
|
||||
.getState(EventTypes.Encryption)
|
||||
?.content
|
||||
.tryGet<String>('algorithm'))) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue