mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-08-28 01:41:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4646 from matrix-org/bwindels/detectnetworkfailureforjoin

Browse Source 
Use connection error to detect network problem
This commit is contained in:
Bruno Windels 2020-05-26 14:18:06 +00:00 committed by GitHub
commit 3fc060c754
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/stores/RoomViewStore.js
View File

@ -273,9 +273,7 @@ class RoomViewStore extends Store {
}); });
let msg = err.message ? err.message : JSON.stringify(err); let msg = err.message ? err.message : JSON.stringify(err);
console.log("Failed to join room:", msg); console.log("Failed to join room:", msg);
// XXX: We are relying on the error message returned by browsers here. if (err.name === "ConnectionError") {
// This isn't great, but it does generalize the error being shown to users.
if (msg && msg.startsWith("CORS request rejected")) {
msg = _t("There was an error joining the room"); msg = _t("There was an error joining the room");
} }
if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') { if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {