mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-29 07:42:40 +00:00
Fix for images sometimes being sent unencrypted in an encrypted room.
This commit is contained in:
parent
905a1acf8f
commit
0357808e0d
5 changed files with 24 additions and 0 deletions
|
@ -444,4 +444,10 @@ typedef NS_ENUM(NSUInteger, MXKRoomViewControllerJoinRoomResult) {
|
|||
*/
|
||||
- (void)handleTypingNotification:(BOOL)typing;
|
||||
|
||||
|
||||
/**
|
||||
Share encryption keys in this room.
|
||||
*/
|
||||
- (void)shareEncryptionKeys;
|
||||
|
||||
@end
|
||||
|
|
|
@ -4564,6 +4564,15 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
|
|||
[self.userSuggestionCoordinator processTextMessage:toolbarView.textMessage];
|
||||
}
|
||||
|
||||
- (void)roomInputToolbarViewDidOpenActionMenu:(MXKRoomInputToolbarView*)toolbarView
|
||||
{
|
||||
// Consider opening the action menu as beginning to type and share encryption keys if requested.
|
||||
if ([MXKAppSettings standardAppSettings].outboundGroupSessionKeyPreSharingStrategy == MXKKeyPreSharingWhenTyping)
|
||||
{
|
||||
[self shareEncryptionKeys];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - MXKRoomMemberDetailsViewControllerDelegate
|
||||
|
||||
- (void)roomMemberDetailsViewController:(MXKRoomMemberDetailsViewController *)roomMemberDetailsViewController startChatWithMemberId:(NSString *)matrixId completion:(void (^)(void))completion
|
||||
|
|
|
@ -47,6 +47,13 @@ typedef enum : NSUInteger
|
|||
*/
|
||||
- (void)roomInputToolbarViewDidChangeTextMessage:(MXKRoomInputToolbarView*)toolbarView;
|
||||
|
||||
/**
|
||||
Inform the delegate that the action menu was opened.
|
||||
|
||||
@param toolbarView the room input toolbar view
|
||||
*/
|
||||
- (void)roomInputToolbarViewDidOpenActionMenu:(MXKRoomInputToolbarView*)toolbarView;
|
||||
|
||||
@end
|
||||
|
||||
/**
|
||||
|
|
|
@ -429,6 +429,7 @@ static const NSTimeInterval kActionMenuComposerHeightAnimationDuration = .3;
|
|||
if (_actionMenuOpened) {
|
||||
self.actionsBar.hidden = NO;
|
||||
[self.actionsBar animateWithShowIn:_actionMenuOpened completion:nil];
|
||||
[self.delegate roomInputToolbarViewDidOpenActionMenu:self];
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
1
changelog.d/5564.bugfix
Normal file
1
changelog.d/5564.bugfix
Normal file
|
@ -0,0 +1 @@
|
|||
Fix for images sometimes being sent unencrypted inside an encrypted room.
|
Loading…
Reference in a new issue