imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into dbkr/default_display_name_register

Browse source
This commit is contained in:
David Baker 2020-01-30 11:45:54 +00:00
commit c8673452be
4 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/MatrixClientPeg.js
View file

@ -32,6 +32,7 @@ import MatrixClientBackedSettingsHandler from "./settings/handlers/MatrixClientB
import * as StorageManager from './utils/StorageManager';
import IdentityAuthClient from './IdentityAuthClient';
import { crossSigningCallbacks } from './CrossSigningManager';
import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
interface MatrixClientCreds {
homeserverUrl: string,
@ -217,7 +218,11 @@ class _MatrixClientPeg {
timelineSupport: true,
forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false),
fallbackICEServerAllowed: !!SettingsStore.getValue('fallbackICEServerAllowed'),
verificationMethods: [verificationMethods.SAS, verificationMethods.QR_CODE_SHOW],
verificationMethods: [
verificationMethods.SAS,
SHOW_QR_CODE_METHOD,
verificationMethods.RECIPROCATE_QR_CODE,
],
unstableClientRelationAggregation: true,
identityServer: new IdentityAuthClient(),
};

6
src/components/views/verification/VerificationShowSas.js
View file

@ -62,7 +62,9 @@ export default class VerificationShowSas extends React.Component {
</div>,
);
sasDisplay = <div className="mx_VerificationShowSas_emojiSas">
{emojiBlocks}
{emojiBlocks.slice(0, 4)}
<div className="mx_VerificationShowSas_emojiSas_break" />
{emojiBlocks.slice(4)}
</div>;
sasCaption = _t(
"Verify this user by confirming the following emoji appear on their screen.",
@ -105,8 +107,8 @@ export default class VerificationShowSas extends React.Component {
return <div className="mx_VerificationShowSas">
<p>{sasCaption}</p>
<p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
{sasDisplay}
<p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
{confirm}
</div>;
}