Skip to content

fix: encrypted behaviour is reversed in room edit #6674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

fix: encrypted behaviour is reversed in room edit #6674

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72b1b1f
change
Rohit3523 Sep 22, 2025
f8e2f97
chore: format code with Prettier [skip ci]
Rohit3523 Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/views/RoomInfoEditView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ const RoomInfoEditView = ({ navigation, route }: IRoomInfoEditViewProps) => {
}

// Encrypted
if (room.encrypted !== encrypted) {
if (room.encrypted !== encrypted && params.roomType !== 'c') {
params.encrypted = encrypted;
}

Expand Down Expand Up @@ -284,7 +284,7 @@ const RoomInfoEditView = ({ navigation, route }: IRoomInfoEditViewProps) => {
const toggleRoomType = (value: boolean) => {
logEvent(events.RI_EDIT_TOGGLE_ROOM_TYPE);
setValue('t', value);
setValue('encrypted', value && encrypted);
setValue('encrypted', !value && encrypted);
};

const toggleReadOnly = (value: boolean) => {
Expand Down Expand Up @@ -462,9 +462,9 @@ const RoomInfoEditView = ({ navigation, route }: IRoomInfoEditViewProps) => {
{encryptionEnabled ? (
<SwitchContainer
value={encrypted as boolean}
disabled={!t}
disabled={t}
leftLabelPrimary={I18n.t('Encrypted')}
leftLabelSecondary={I18n.t('End_to_end_encrypted_room')}
leftLabelSecondary={t ? I18n.t('Channel_hint_encrypted_not_available') : I18n.t('End_to_end_encrypted_room')}
testID='room-info-edit-switch-encrypted'
onValueChange={toggleEncrypted}
labelContainerStyle={styles.hideSystemMessages}
Expand Down