Signed-off-by: Ajay Bura <ajbura@gmail.com>
This commit is contained in:
Ajay Bura 2022-03-31 14:52:33 +05:30
parent 575eacae92
commit ebec39bdd1
6 changed files with 17 additions and 17 deletions

View file

@ -2,17 +2,17 @@
import { useState, useEffect } from 'react';
import initMatrix from '../../client/initMatrix';
import { hasCrossSigninAccountData } from '../../util/matrixUtil';
import { hasCrossSigningAccountData } from '../../util/matrixUtil';
export function useCrossSigninStatus() {
export function useCrossSigningStatus() {
const mx = initMatrix.matrixClient;
const [isCSEnabled, setIsCSEnbaled] = useState(hasCrossSigninAccountData());
const [isCSEnabled, setIsCSEnabled] = useState(hasCrossSigningAccountData());
useEffect(() => {
if (isCSEnabled) return null;
const handleAccountData = (event) => {
if (event.getType() === 'm.cross_signing.master') {
setIsCSEnbaled(true);
setIsCSEnabled(true);
}
};

View file

@ -1,7 +1,7 @@
import React from 'react';
import initMatrix from '../../../client/initMatrix';
import { hasCrossSigninAccountData } from '../../../util/matrixUtil';
import { hasCrossSigningAccountData } from '../../../util/matrixUtil';
import Text from '../../atoms/text/Text';
import Button from '../../atoms/button/Button';
@ -10,10 +10,10 @@ import SettingTile from '../../molecules/setting-tile/SettingTile';
function CrossSignin() {
return (
<SettingTile
title="Cross sign-in"
title="Cross signing"
content={<Text variant="b3">Setup to verify and keep track of all your devices. Also required to enable secure encryption key backup.</Text>}
options={(
hasCrossSigninAccountData()
hasCrossSigningAccountData()
? <Button variant="danger">Reset</Button>
: <Button variant="primary">Setup</Button>
)}

View file

@ -19,12 +19,12 @@ import InfoIC from '../../../../public/res/ic/outlined/info.svg';
import { useStore } from '../../hooks/useStore';
import { useDeviceList } from '../../hooks/useDeviceList';
import { useCrossSigninStatus } from '../../hooks/useCrossSigninStatus';
import { useCrossSigningStatus } from '../../hooks/useCrossSigningStatus';
function DeviceManage() {
const TRUNCATED_COUNT = 4;
const mx = initMatrix.matrixClient;
const isCSEnabled = useCrossSigninStatus();
const isCSEnabled = useCrossSigningStatus();
const deviceList = useDeviceList();
const [processing, setProcessing] = useState([]);
const [truncated, setTruncated] = useState(true);
@ -159,7 +159,7 @@ function DeviceManage() {
rounded
variant="caution"
iconSrc={InfoIC}
title="Setup cross sign-in in case you lose all your devices."
title="Setup cross signing in case you lose all your devices."
/>
</div>
)}

View file

@ -13,11 +13,11 @@ import InfoIC from '../../../../public/res/ic/outlined/info.svg';
import BinIC from '../../../../public/res/ic/outlined/bin.svg';
import DownloadIC from '../../../../public/res/ic/outlined/download.svg';
import { useCrossSigninStatus } from '../../hooks/useCrossSigninStatus';
import { useCrossSigningStatus } from '../../hooks/useCrossSigningStatus';
function KeyBackup() {
const mx = initMatrix.matrixClient;
const isCSEnabled = useCrossSigninStatus();
const isCSEnabled = useCrossSigningStatus();
const [keyBackup, setKeyBackup] = useState(undefined);
useEffect(() => {
@ -55,7 +55,7 @@ function KeyBackup() {
rounded
variant="caution"
iconSrc={InfoIC}
title="Setup cross sign-in to backup your encrypted messages."
title="Setup cross signing to backup your encrypted messages."
/>
)}
</>

View file

@ -26,7 +26,7 @@ import ImportE2ERoomKeys from '../../molecules/import-export-e2e-room-keys/Impor
import ExportE2ERoomKeys from '../../molecules/import-export-e2e-room-keys/ExportE2ERoomKeys';
import ProfileEditor from '../profile-editor/ProfileEditor';
import CrossSignin from './CrossSignin';
import CrossSigning from './CrossSigning';
import KeyBackup from './KeyBackup';
import DeviceManage from './DeviceManage';
@ -170,8 +170,8 @@ function SecuritySection() {
return (
<div className="settings-security">
<div className="settings-security__card">
<MenuHeader>Cross sign-in and backup</MenuHeader>
<CrossSignin />
<MenuHeader>Cross signing and backup</MenuHeader>
<CrossSigning />
<KeyBackup />
</div>
<DeviceManage />

View file

@ -175,7 +175,7 @@ export function isCrossVerified(deviceId) {
}
}
export function hasCrossSigninAccountData() {
export function hasCrossSigningAccountData() {
const mx = initMatrix.matrixClient;
const masterKeyData = mx.getAccountData('m.cross_signing.master');
return !!masterKeyData;