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 | *.pyc | ||||||
| *.swp | *.swp | ||||||
| *.swo | *.swo | ||||||
|  | *.dylib | ||||||
| .DS_Store | .DS_Store | ||||||
| .atom/ | .atom/ | ||||||
| .buildlog/ | .buildlog/ | ||||||
|  |  | ||||||
|  | @ -1793,8 +1793,11 @@ class Client extends MatrixApi { | ||||||
|       // man-in-the-middle attacks! |       // man-in-the-middle attacks! | ||||||
|       if ((event.type == EventTypes.Encryption && |       if ((event.type == EventTypes.Encryption && | ||||||
|           room.encrypted && |           room.encrypted && | ||||||
|           event.content['algorithm'] != |           event.content.tryGet<String>('algorithm') != | ||||||
|               room.getState(EventTypes.Encryption)?.content['algorithm'])) { |               room | ||||||
|  |                   .getState(EventTypes.Encryption) | ||||||
|  |                   ?.content | ||||||
|  |                   .tryGet<String>('algorithm'))) { | ||||||
|         return; |         return; | ||||||
|       } |       } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue