Merge pull request #7080 from jitsi/fix-e2ee
fix(e2ee): hide if not supported.
This commit is contained in:
commit
7b429afee6
|
@ -42,6 +42,11 @@ type Props = {
|
||||||
*/
|
*/
|
||||||
_passwordNumberOfDigits: ?number,
|
_passwordNumberOfDigits: ?number,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates whether e2ee will be displayed or not.
|
||||||
|
*/
|
||||||
|
_showE2ee: boolean,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Action that sets the conference password.
|
* Action that sets the conference password.
|
||||||
*/
|
*/
|
||||||
|
@ -64,6 +69,7 @@ function SecurityDialog({
|
||||||
_locked,
|
_locked,
|
||||||
_password,
|
_password,
|
||||||
_passwordNumberOfDigits,
|
_passwordNumberOfDigits,
|
||||||
|
_showE2ee,
|
||||||
setPassword
|
setPassword
|
||||||
}: Props) {
|
}: Props) {
|
||||||
const [ passwordEditEnabled, setPasswordEditEnabled ] = useState(false);
|
const [ passwordEditEnabled, setPasswordEditEnabled ] = useState(false);
|
||||||
|
@ -93,8 +99,13 @@ function SecurityDialog({
|
||||||
passwordNumberOfDigits = { _passwordNumberOfDigits }
|
passwordNumberOfDigits = { _passwordNumberOfDigits }
|
||||||
setPassword = { setPassword }
|
setPassword = { setPassword }
|
||||||
setPasswordEditEnabled = { setPasswordEditEnabled } />
|
setPasswordEditEnabled = { setPasswordEditEnabled } />
|
||||||
|
{
|
||||||
|
_showE2ee ? <>
|
||||||
<div className = 'separator-line' />
|
<div className = 'separator-line' />
|
||||||
<E2EESection />
|
<E2EESection />
|
||||||
|
</> : null
|
||||||
|
}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
);
|
);
|
||||||
|
@ -111,6 +122,7 @@ function SecurityDialog({
|
||||||
function mapStateToProps(state) {
|
function mapStateToProps(state) {
|
||||||
const {
|
const {
|
||||||
conference,
|
conference,
|
||||||
|
e2eeSupported,
|
||||||
locked,
|
locked,
|
||||||
password
|
password
|
||||||
} = state['features/base/conference'];
|
} = state['features/base/conference'];
|
||||||
|
@ -120,7 +132,8 @@ function mapStateToProps(state) {
|
||||||
_conference: conference,
|
_conference: conference,
|
||||||
_dialIn: state['features/invite'],
|
_dialIn: state['features/invite'],
|
||||||
_locked: locked,
|
_locked: locked,
|
||||||
_password: password
|
_password: password,
|
||||||
|
_showE2ee: Boolean(e2eeSupported)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue