mirror of https://github.com/vector-im/riot-web
dont enable e2ee when inviting a 3pid
parent
98b418a809
commit
be13e86b09
|
@ -577,10 +577,13 @@ export default class InviteDialog extends React.PureComponent {
|
||||||
if (SettingsStore.getValue("feature_cross_signing")) {
|
if (SettingsStore.getValue("feature_cross_signing")) {
|
||||||
// Check whether all users have uploaded device keys before.
|
// Check whether all users have uploaded device keys before.
|
||||||
// If so, enable encryption in the new room.
|
// If so, enable encryption in the new room.
|
||||||
const client = MatrixClientPeg.get();
|
const containsNonMatrixUsers = targets.some(t => !(t instanceof DirectoryMember));
|
||||||
const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
|
if (!containsNonMatrixUsers) {
|
||||||
if (allHaveDeviceKeys) {
|
const client = MatrixClientPeg.get();
|
||||||
createRoomOptions.encryption = true;
|
const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
|
||||||
|
if (allHaveDeviceKeys) {
|
||||||
|
createRoomOptions.encryption = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue