From 4c2fe55fdcb601f050dd5b94c2536877e5a5c24b Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 3 Dec 2015 10:52:06 +0000 Subject: [PATCH] Don't show the error dialog if the request was canceled. Handle 'request entity too large'. --- src/ContentMessages.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/ContentMessages.js b/src/ContentMessages.js index 59fea7bff4..094eff18d9 100644 --- a/src/ContentMessages.js +++ b/src/ContentMessages.js @@ -108,11 +108,17 @@ class ContentMessages { return matrixClient.sendMessage(roomId, content); }, function(err) { dis.dispatch({action: 'upload_failed', upload: upload}); - var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); - Modal.createDialog(ErrorDialog, { - title: "Upload Failed", - description: "The file '"+upload.fileName+"' failed to upload." - }); + if (!upload.canceled) { + var desc = "The file '"+upload.fileName+"' failed to upload."; + if (err.http_status == 413) { + desc = "The file '"+upload.fileName+"' exceeds this home server's size limit for uploads"; + } + var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); + Modal.createDialog(ErrorDialog, { + title: "Upload Failed", + description: desc + }); + } }).finally(function() { var inprogressKeys = Object.keys(self.inprogress); for (var i = 0; i < self.inprogress.length; ++i) {