This repository was archived by the owner on Sep 11, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +2
-10
lines changed Expand file tree Collapse file tree 2 files changed +2
-10
lines changed Original file line number Diff line number Diff line change @@ -712,8 +712,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
712712 this . props . onFinished ( ) ;
713713 }
714714
715- if ( cli . isRoomEncrypted ( this . props . roomId ) &&
716- SettingsStore . getValue ( "feature_room_history_key_sharing" ) ) {
715+ if ( cli . isRoomEncrypted ( this . props . roomId ) ) {
717716 const visibilityEvent = room . currentState . getStateEvents (
718717 "m.room.history_visibility" , "" ,
719718 ) ;
@@ -1344,8 +1343,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
13441343 buttonText = _t ( "Invite" ) ;
13451344 goButtonFn = this . _inviteUsers ;
13461345
1347- if ( SettingsStore . getValue ( "feature_room_history_key_sharing" ) &&
1348- cli . isRoomEncrypted ( this . props . roomId ) ) {
1346+ if ( cli . isRoomEncrypted ( this . props . roomId ) ) {
13491347 const room = cli . getRoom ( this . props . roomId ) ;
13501348 const visibilityEvent = room . currentState . getStateEvents (
13511349 "m.room.history_visibility" , "" ,
Original file line number Diff line number Diff line change @@ -220,12 +220,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
220220 supportedLevels : LEVELS_FEATURE ,
221221 default : false ,
222222 } ,
223- "feature_room_history_key_sharing" : {
224- isFeature : true ,
225- displayName : _td ( "Share decryption keys for room history when inviting users" ) ,
226- supportedLevels : LEVELS_FEATURE ,
227- default : true ,
228- } ,
229223 "advancedRoomListLogging" : {
230224 // TODO: Remove flag before launch: https://github.com/vector-im/element-web/issues/14231
231225 displayName : _td ( "Enable advanced debugging for the room list" ) ,
You can’t perform that action at this time.
0 commit comments