Skip to content

Commit

Permalink
added support to decrypt older message
Browse files Browse the repository at this point in the history
  • Loading branch information
ajbura committed Aug 1, 2021
1 parent 9f6047a commit e597f81
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 6 deletions.
23 changes: 18 additions & 5 deletions src/app/organisms/settings/Settings.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useEffect } from 'react';
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import './Settings.scss';

Expand All @@ -12,6 +12,7 @@ import SegmentedControls from '../../atoms/segmented-controls/SegmentedControls'

import PopupWindow, { PWContentSelector } from '../../molecules/popup-window/PopupWindow';
import SettingTile from '../../molecules/setting-tile/SettingTile';
import ImportE2ERoomKeys from '../../molecules/import-e2e-room-keys/ImportE2ERoomKeys';

import SunIC from '../../../../public/res/ic/outlined/sun.svg';
import LockIC from '../../../../public/res/ic/outlined/lock.svg';
Expand Down Expand Up @@ -44,16 +45,28 @@ function AppearanceSection() {

function SecuritySection() {
return (
<div className="settings-content">
<Text>{`Device ID: ${initMatrix.matrixClient.getDeviceId()}`}</Text>
<div className="set-security settings-content">
<SettingTile
title={`Device ID: ${initMatrix.matrixClient.getDeviceId()}`}
content={<Text variant="b3">Use this device ID to verify or manage this session from Element client.</Text>}
/>
<SettingTile
title="Import E2E room keys"
content={(
<>
<Text variant="b3">{'To decrypt older messages, Export E2EE room keys from Element (Settings > Security & Privacy > Encryption > Cryptography) and import them here. Imported keys are also encrypted so you have to enter account password.'}</Text>
<ImportE2ERoomKeys />
</>
)}
/>
</div>
);
}

function AboutSection() {
return (
<div className="settings-content settings__about">
<div className="settings__about__branding">
<div className="set-about__branding">
<img width="60" height="60" src={CinnySVG} alt="Cinny logo" />
<div>
<Text variant="h2">
Expand All @@ -62,7 +75,7 @@ function AboutSection() {
</Text>
<Text>Yet another matrix client</Text>

<div className="settings__about__btns">
<div className="set-about__btns">
<Button onClick={() => window.open('https://github.com/ajbura/cinny')}>Source code</Button>
<Button onClick={() => window.open('https://liberapay.com/ajbura/donate')}>Support</Button>
</div>
Expand Down
7 changes: 6 additions & 1 deletion src/app/organisms/settings/Settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@

& .setting-tile {
margin-top: var(--sp-normal);
border-bottom: 1px solid var(--bg-surface-border);
padding-bottom: 16px;
&__title__wrapper {
margin-bottom: var(--sp-ultra-tight);
}
}
}

.settings__about {
.set-about {
&__branding {
margin-top: var(--sp-extra-tight);
margin-bottom: var(--sp-normal);
Expand Down

0 comments on commit e597f81

Please sign in to comment.