only show "can't redact" dialog when not a network error
as the redaction is queued now and might be sent laterpull/21833/head
							parent
							
								
									1515f8de17
								
							
						
					
					
						commit
						a11deffe5e
					
				|  | @ -119,19 +119,28 @@ 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)
 | ||||
|                     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(); | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Bruno Windels
						Bruno Windels