Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Add .well-known option to control default e2ee behaviour #4605

Merged
merged 17 commits into from
Jun 3, 2020

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented May 19, 2020

t3chguy added 2 commits June 1, 2020 21:42
…ix-org/matrix-react-sdk into t3chguy/e2eedefault

� Conflicts:
�	src/components/views/dialogs/InviteDialog.js
@t3chguy t3chguy force-pushed the t3chguy/e2eedefault branch from 502c766 to cbc2aee Compare June 1, 2020 21:35
t3chguy added 11 commits June 1, 2020 22:37
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
…ix-org/matrix-react-sdk into t3chguy/e2eedefault
…ix-org/matrix-react-sdk into t3chguy/e2eedefault
…ix-org/matrix-react-sdk into t3chguy/e2eedefault

� Conflicts:
�	src/components/views/dialogs/CreateRoomDialog.js
�	src/components/views/dialogs/InviteDialog.js
�	src/components/views/right_panel/UserInfo.js
�	src/createRoom.js
@t3chguy
Copy link
Member Author

t3chguy commented Jun 3, 2020

Show tile similar to the Encryption enabled tile for non-e2ee rooms

This has been descoped due to complexity with injecting tiles unrelated to timeline events and will be handled by next week's "Notifications" rework project.

@t3chguy t3chguy marked this pull request as ready for review June 3, 2020 11:13
@jryans jryans changed the title Add e2ee_default_for_private_rooms to control default e2ee behaviour Add .well-known option to control default e2ee behaviour Jun 3, 2020
@t3chguy t3chguy requested review from a team June 3, 2020 11:27
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy t3chguy requested a review from dbkr June 3, 2020 12:58
Signed-off-by: Michael Telatynski <[email protected]>
Copy link
Member

@dbkr dbkr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

Copy link
Contributor

@nadonomy nadonomy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@t3chguy t3chguy merged commit eccacb1 into develop Jun 3, 2020
@t3chguy t3chguy deleted the t3chguy/e2eedefault branch June 3, 2020 21:12
@Bun-Bun
Copy link

Bun-Bun commented Jun 15, 2020

Can this be expanded to include not only default behavior but force off behavior?

@t3chguy
Copy link
Member Author

t3chguy commented Jun 15, 2020

No. That is a distinct issue, as you know, which should be enforced by the server for consistent behaviour between clients.

@matrix-org matrix-org locked as off-topic and limited conversation to collaborators Jun 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add admin option to disable E2EE for DMs / private rooms (users can still enable)
4 participants