-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
try : upgrade patch security user settings with new device panel (#678)
* upgrade roughly patch change sections order in security privacy settings * fix compilation error * update labels * hide security recommendation section * update labels * Add :TCHAP: annotations * Layout fixes (font size etc) * Spelling fix * Spelling fix * Spelling fix * Add extra explanation of cross-signing * Extra translations --------- Co-authored-by: Estelle Comment <[email protected]>
- Loading branch information
1 parent
0fdba8b
commit 91b49ce
Showing
5 changed files
with
209 additions
and
90 deletions.
There are no files selected for viewing
89 changes: 0 additions & 89 deletions
89
patches/change-sections-order-in-security-privacy-settings/matrix-react-sdk+3.71.1.patch
This file was deleted.
Oops, something went wrong.
98 changes: 98 additions & 0 deletions
98
patches/change-sections-order-in-security-privacy-settings/matrix-react-sdk+3.78.0.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| diff --git a/node_modules/matrix-react-sdk/src/components/views/settings/CryptographyPanel.tsx b/node_modules/matrix-react-sdk/src/components/views/settings/CryptographyPanel.tsx | ||
| index 5a5e424..dd45888 100644 | ||
| --- a/node_modules/matrix-react-sdk/src/components/views/settings/CryptographyPanel.tsx | ||
| +++ b/node_modules/matrix-react-sdk/src/components/views/settings/CryptographyPanel.tsx | ||
| @@ -73,25 +73,36 @@ export default class CryptographyPanel extends React.Component<IProps, IState> { | ||
| } | ||
|
|
||
| return ( | ||
| - <SettingsSubsection heading={_t("Cryptography")}> | ||
| - <SettingsSubsectionText> | ||
| - <table className="mx_CryptographyPanel_sessionInfo"> | ||
| - <tr> | ||
| - <th scope="row">{_t("Session ID:")}</th> | ||
| - <td> | ||
| - <code>{deviceId}</code> | ||
| - </td> | ||
| - </tr> | ||
| - <tr> | ||
| - <th scope="row">{_t("Session key:")}</th> | ||
| - <td> | ||
| - <code> | ||
| - <b>{identityKey}</b> | ||
| - </code> | ||
| - </td> | ||
| - </tr> | ||
| - </table> | ||
| - </SettingsSubsectionText> | ||
| + <SettingsSubsection heading={_t("Tchap keys")}> {/* :TCHAP: change vocabulary and layout */} | ||
| + <div className="mx_SettingsTab_subsectionText"> | ||
| + <div> | ||
| + {_t("These keys only apply to the current session.")} | ||
| + </div> | ||
| + <div> | ||
| + <b>{_t("Please note this is not your recovery code for your automatic backup.")}</b> | ||
| + </div> | ||
| + </div> | ||
| + <details> | ||
| + <summary>{_t("Advanced")}</summary> | ||
| + <SettingsSubsectionText> | ||
| + <table className="mx_CryptographyPanel_sessionInfo"> | ||
| + <tr> | ||
| + <th scope="row">{_t("Session ID:")}</th> | ||
| + <td> | ||
| + <code>{deviceId}</code> | ||
| + </td> | ||
| + </tr> | ||
| + <tr> | ||
| + <th scope="row">{_t("Session key:")}</th> | ||
| + <td> | ||
| + <code> | ||
| + <b>{identityKey}</b> | ||
| + </code> | ||
| + </td> | ||
| + </tr> | ||
| + </table> | ||
| + </SettingsSubsectionText> | ||
| + </details> {/** end :TCHAP: */} | ||
| {importExportButtons} | ||
| {noSendUnverifiedSetting} | ||
| </SettingsSubsection> | ||
| diff --git a/node_modules/matrix-react-sdk/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx b/node_modules/matrix-react-sdk/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx | ||
| index 8f085a7..1bae58b 100644 | ||
| --- a/node_modules/matrix-react-sdk/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx | ||
| +++ b/node_modules/matrix-react-sdk/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx | ||
| @@ -275,11 +275,13 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt | ||
| } | ||
|
|
||
| public render(): React.ReactNode { | ||
| + // :TCHAP: we're moving this subsection out, so it's now a section | ||
| const secureBackup = ( | ||
| - <SettingsSubsection heading={_t("Secure Backup")}> | ||
| + <SettingsSection heading={_t("Secure Backup")}> | ||
| <SecureBackupPanel /> | ||
| - </SettingsSubsection> | ||
| + </SettingsSection> | ||
| ); | ||
| + // end :TCHAP: | ||
|
|
||
| const eventIndex = ( | ||
| <SettingsSubsection heading={_t("Message search")}> | ||
| @@ -359,13 +361,14 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt | ||
| return ( | ||
| <SettingsTab> | ||
| {warning} | ||
| + { /* :TCHAP: move secureBackup and privacySection, and remove eventIndex */ } | ||
| + {secureBackup} | ||
| <SettingsSection heading={_t("Encryption")}> | ||
| - {secureBackup} | ||
| - {eventIndex} | ||
| {crossSigning} | ||
| <CryptographyPanel /> | ||
| + {privacySection} | ||
| </SettingsSection> | ||
| - {privacySection} | ||
| + { /* end :TCHAP: */ } | ||
| {advancedSection} | ||
| </SettingsTab> | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters