Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-02-15 07:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

When user cancels filesystem dialog, reset to choice screen

Browse Source
This commit is contained in:
Scott Nonnenberg
2018-06-13 17:29:56 -07:00
parent 327fc7b215
commit fae282cf8e
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
js/views/migration_view.js
View File

@@ -319,25 +319,27 @@
Whisper.Migration.beginExport()
.then(this.completeMigration.bind(this))
.catch(this.onError.bind(this));
.catch(function(error) {
// We ensure that a restart of the app acts as if the user never tried
// to export.
Whisper.Migration.cancel();
// We special-case the error we get when the user cancels out of the
// filesystem choice dialog: it's not shown an error.
if (!error || error.name !== 'ChooseError') {
this.error = error || new Error('in case we reject() null!');
}
// Because this is our first time attempting to export, we go back to
// the choice step. Compare this to the end of onClickChoose().
this.selectStep(STEPS.CHOOSE);
}.bind(this));
},
completeMigration: function(target) {
// This will prevent connection to the server on future app launches
Whisper.Migration.markComplete(target);
this.selectStep(STEPS.COMPLETE);
},
onError: function(error) {
if (error && error.name === 'ChooseError') {
this.cancelMigration();
} else {
this.error = error || new Error('in case we reject() null!');
this.cancelMigration();
}
},
cancelMigration: function() {
Whisper.Migration.cancel();
this.render();
}
});
}());