Merge branch 'soru/display-fingerprint-key' into 'main'

fix: Display right key in key request dialog

Closes #225

See merge request ChristianPauly/fluffychat-flutter!314
This commit is contained in:
Sorunome 2020-12-19 15:54:57 +00:00
commit bf00bbd9f5
2 changed files with 6 additions and 1 deletions

View File

@ -347,7 +347,7 @@ class MatrixState extends State<Matrix> {
context: context,
title: L10n.of(context).requestToReadOlderMessages,
message:
'${sender.id}\n\n${L10n.of(context).device}:\n${request.requestingDevice.deviceId}\n\n${L10n.of(context).identity}:\n${request.requestingDevice.curve25519Key.beautified}',
'${sender.id}\n\n${L10n.of(context).device}:\n${request.requestingDevice.deviceId}\n\n${L10n.of(context).publicKey}:\n${request.requestingDevice.ed25519Key.beautified}',
okLabel: L10n.of(context).verify,
cancelLabel: L10n.of(context).deny,
) ==

View File

@ -1204,6 +1204,11 @@
"type": "text",
"placeholders": {}
},
"publicKey": "Public Key",
"@publicKey": {
"type": "text",
"placeholders": {}
},
"publicRooms": "Public Rooms",
"@publicRooms": {
"type": "text",