matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

More sensible buttons in UnknownDeviceDialog

Browse Source 
Just say 'Send' (or equiv) if you actually verify all the devices,
rather than 'Send Anyway'.
This commit is contained in:
David Baker
2017-11-16 17:59:42 +00:00
parent 3c8645871f
commit 65e1d49f37
4 changed files with 72 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/cryptodevices.js
View File

@@ -44,8 +44,7 @@ export function getUnknownDevicesForRoom(matrixClient, room) {
export function showUnknownDeviceDialogForMessages(matrixClient, room) {
getUnknownDevicesForRoom(matrixClient, room).then((unknownDevices) => {
const onSendAnywayClicked = () => {
markAllDevicesKnown(matrixClient, unknownDevices);
const onSendClicked = () => {
Resend.resendUnsentEvents(room);
};
@@ -54,32 +53,21 @@ export function showUnknownDeviceDialogForMessages(matrixClient, room) {
room: room,
devices: unknownDevices,
sendAnywayLabel: _t("Send anyway"),
onSendAnyway: onSendAnywayClicked,
sendLabel: _t("Send"),
onSend: onSendClicked,
}, 'mx_Dialog_unknownDevice');
});
}
export function showUnknownDeviceDialogForCalls(matrixClient, room, sendAnyway, sendAnywayLabel) {
export function showUnknownDeviceDialogForCalls(matrixClient, room, sendAnyway, sendAnywayLabel, sendLabel) {
getUnknownDevicesForRoom(matrixClient, room).then((unknownDevices) => {
const onSendAnywayClicked = () => {
markAllDevicesKnown(matrixClient, unknownDevices);
sendAnyway();
};
const UnknownDeviceDialog = sdk.getComponent('dialogs.UnknownDeviceDialog');
Modal.createTrackedDialog('Unknown Device Dialog', '', UnknownDeviceDialog, {
room: room,
devices: unknownDevices,
sendAnywayLabel: sendAnywayLabel,
onSendAnyway: onSendAnywayClicked,
sendLabel: sendLabel,
onSend: sendAnyway,
}, 'mx_Dialog_unknownDevice');
});
}
function markAllDevicesKnown(matrixClient, devices) {
Object.keys(devices).forEach((userId) => {
Object.keys(devices[userId]).map((deviceId) => {
matrixClient.setDeviceKnown(userId, deviceId, true);
});
});
}