diff --git a/Vector/AppDelegate.m b/Vector/AppDelegate.m index da1f68009..301612db3 100644 --- a/Vector/AppDelegate.m +++ b/Vector/AppDelegate.m @@ -1836,6 +1836,7 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN invite:invite invite3PID:nil isDirect:(invite.count != 0) + preset:kMXRoomPresetTrustedPrivateChat success:^(MXRoom *room) { // Open created room diff --git a/Vector/ViewController/ContactDetailsViewController.m b/Vector/ViewController/ContactDetailsViewController.m index ce4c09dbf..bc0c8d44e 100644 --- a/Vector/ViewController/ContactDetailsViewController.m +++ b/Vector/ViewController/ContactDetailsViewController.m @@ -903,6 +903,7 @@ invite:inviteArray invite3PID:invite3PIDArray isDirect:YES + preset:kMXRoomPresetTrustedPrivateChat success:^(MXRoom *room) { roomCreationRequest = nil; @@ -952,6 +953,7 @@ invite:@[matrixId] invite3PID:nil isDirect:YES + preset:kMXRoomPresetTrustedPrivateChat success:^(MXRoom *room) { roomCreationRequest = nil; diff --git a/Vector/ViewController/StartChatViewController.m b/Vector/ViewController/StartChatViewController.m index 88ce03968..9927b4126 100644 --- a/Vector/ViewController/StartChatViewController.m +++ b/Vector/ViewController/StartChatViewController.m @@ -621,6 +621,10 @@ } } + // Ensure direct chat are created with equal ops on both sides (the trusted_private_chat preset) + BOOL isDirect = ((inviteArray.count + invite3PIDArray.count == 1) ? YES : NO); + MXRoomPreset preset = (isDirect ? kMXRoomPresetTrustedPrivateChat : nil); + // Create new room roomCreationRequest = [self.mainSession createRoom:nil visibility:kMXRoomDirectoryVisibilityPrivate @@ -628,7 +632,8 @@ topic:nil invite:(inviteArray.count ? inviteArray : nil) invite3PID:(invite3PIDArray.count ? invite3PIDArray : nil) - isDirect:((inviteArray.count + invite3PIDArray.count == 1) ? YES : NO) + isDirect:isDirect + preset:preset success:^(MXRoom *room) { roomCreationRequest = nil;