Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve issue #123

Browse source
This commit is contained in:
djmaze 2021-08-25 12:00:50 +02:00
parent 8934205ede
commit 5db8f032b8
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/App/User.js
View file

@ -380,8 +380,8 @@ class AppUser extends AbstractApp {
.then(() => promise) .then(() => promise)
.then( .then(
() => Remote.foldersReloadWithTimeout(), () => Remote.foldersReloadWithTimeout(),
errorCode => { error => {
FolderUserStore.folderListError(getNotification(errorCode, '', errorDefCode)); FolderUserStore.folderListError(getNotification(error.code, '', errorDefCode) + '.\n' + error.message);
Remote.foldersReloadWithTimeout(); Remote.foldersReloadWithTimeout();
} }
); );

14
dev/Remote/AbstractFetch.js
View file

@ -63,6 +63,14 @@ fetchJSON = (action, sGetAdd, params, timeout, jsonCallback) => {
return rl.fetchJSON(getURL(sGetAdd), init, sGetAdd ? null : params).then(jsonCallback); return rl.fetchJSON(getURL(sGetAdd), init, sGetAdd ? null : params).then(jsonCallback);
}; };
class FetchError extends Error
{
constructor(code, message) {
super(message);
this.code = code || Notification.JsonFalse;
}
}
export class AbstractFetchRemote export class AbstractFetchRemote
{ {
abort(sAction, bClearOnly) { abort(sAction, bClearOnly) {
@ -201,8 +209,10 @@ export class AbstractFetchRemote
if (!data.Result || action !== data.Action) { if (!data.Result || action !== data.Action) {
checkResponseError(data); checkResponseError(data);
const err = data ? data.ErrorCode : 0; return Promise.reject(new FetchError(
return Promise.reject(err || Notification.JsonFalse); data ? data.ErrorCode : 0,
data ? (data.ErrorMessageAdditional || data.ErrorMessage) : ''
));
} }
return data; return data;