Merge pull request #4513 from matrix-org/bwindels/dontencryptfor3pids-rc

Don't enable e2ee when inviting a 3pid
This commit is contained in:
Bruno Windels 2020-04-29 09:58:38 +00:00 committed by GitHub
commit da52a16ff4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -577,10 +577,13 @@ export default class InviteDialog extends React.PureComponent {
if (SettingsStore.getValue("feature_cross_signing")) {
// Check whether all users have uploaded device keys before.
// If so, enable encryption in the new room.
const client = MatrixClientPeg.get();
const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
if (allHaveDeviceKeys) {
createRoomOptions.encryption = true;
const has3PidMembers = targets.some(t => t instanceof ThreepidMember);
if (!has3PidMembers) {
const client = MatrixClientPeg.get();
const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
if (allHaveDeviceKeys) {
createRoomOptions.encryption = true;
}
}
}