Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Don't show "can't redact" dialog on network error, with redaction having local echo & queuing now. #3058

Merged
merged 4 commits into from
Jun 5, 2019
Merged

Don't show "can't redact" dialog on network error, with redaction having local echo & queuing now. #3058

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a11deff
only show "can't redact" dialog when not a network error
bwindels Jun 4, 2019
629b776
clarify why we dont need dialog on network error
bwindels Jun 4, 2019
62ad40d
spelling
bwindels Jun 4, 2019
ef7b762
use Room.redactionCancelled event
bwindels Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions src/components/views/context_menus/MessageContextMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,19 +119,29 @@ module.exports = React.createClass({
onRedactClick: function() {
const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
Modal.createTrackedDialog('Confirm Redact Dialog', '', ConfirmRedactDialog, {
onFinished: (proceed) => {
onFinished: async (proceed) => {
if (!proceed) return;

const cli = MatrixClientPeg.get();
cli.redactEvent(this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()).catch(function(e) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
// display error message stating you couldn't delete this.
try {
await cli.redactEvent(
this.props.mxEvent.getRoomId(),
this.props.mxEvent.getId(),
);
} catch (e) {
const code = e.errcode || e.statusCode;
Modal.createTrackedDialog('You cannot delete this message', '', ErrorDialog, {
title: _t('Error'),
description: _t('You cannot delete this message. (%(code)s)', {code}),
});
}).done();
// only show the dialog if failing for something other than a network error
// (e.g. no errcode or statusCode) as in that case the redactions end up in the
// detached queue and we show the room status bar to allow retry
if (typeof code !== "undefined") {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
// display error message stating you couldn't delete this.
Modal.createTrackedDialog('You cannot delete this message', '', ErrorDialog, {
title: _t('Error'),
description: _t('You cannot delete this message. (%(code)s)', {code}),
});
}
}
},
}, 'mx_Dialog_confirmredact');
this.closeMenu();
Expand Down