mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Better install view error handling (#1472)

Browse source 
If linking fails because an http request didn't connect, show a message and
allow the user to start over.

// FREEBIE
This commit is contained in:
Lilia 2017-09-13 22:44:06 +02:00 • committed by Scott Nonnenberg
parent e6c7ebcaf9
commit f698d0bc51
No known key found for this signature in database
GPG key ID: A4931C09644C654B
4 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/views/install_view.js
View file

@ -11,6 +11,7 @@
ENTER_NAME: 4,
PROGRESS_BAR: 5,
TOO_MANY_DEVICES: 'TooManyDevices',
NETWORK_ERROR: 'NetworkError',
};
Whisper.InstallView = Whisper.View.extend({
@ -31,7 +32,9 @@
installComputerName: i18n('installComputerName'),
installFinalButton: i18n('installFinalButton'),
installTooManyDevices: i18n('installTooManyDevices'),
installConnectionFailed: i18n('installConnectionFailed'),
ok: i18n('ok'),
tryAgain: i18n('tryAgain'),
development: window.config.environment === 'development'
};
},
@ -74,10 +77,13 @@
if (this.canceled) {
return;
}
console.log('provisioning failed', e.stack);
if (e.message === 'websocket closed') {
this.showConnectionError();
this.trigger('disconnected');
} else if (e.name === 'HTTPError' && e.code == -1) {
this.selectStep(Steps.NETWORK_ERROR);
} else if (e.name === 'HTTPError' && e.code == 411) {
this.showTooManyDevices();
} else {