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 #471 by extending fetch messagelist to 60 seconds and handling timeout/abort

Browse source
This commit is contained in:
the-djmaze 2022-08-01 13:59:14 +02:00
parent 31b12c3625
commit 2c4bd445a5
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/Remote/AbstractFetch.js
View file

@ -175,7 +175,7 @@ export class AbstractFetchRemote
) )
.catch(err => { .catch(err => {
console.error(err); console.error(err);
fCallback && fCallback(err.name == 'AbortError' ? 2 : 1); fCallback && fCallback(err.name == 'AbortError' ? 2 : 1, err);
}); });
} }

2
dev/Remote/User/Fetch.js
View file

@ -54,7 +54,7 @@ class RemoteUserFetch extends AbstractFetchRemote {
this.request('MessageList', this.request('MessageList',
fCallback, fCallback,
params, params,
30000, 60000, // 60 seconds before aborting
sGetAdd, sGetAdd,
bSilent ? [] : ['MessageList'] bSilent ? [] : ['MessageList']
); );

4
dev/Stores/User/Messagelist.js
View file

@ -171,8 +171,8 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
if (iError) { if (iError) {
if (Notification.RequestAborted !== iError) { if (Notification.RequestAborted !== iError) {
MessagelistUserStore([]); MessagelistUserStore([]);
MessagelistUserStore.error(getNotification(iError));
} }
MessagelistUserStore.error(getNotification(iError) || oData.message);
} else { } else {
const collection = MessageCollectionModel.reviveFromJson(oData.Result, bCached); const collection = MessageCollectionModel.reviveFromJson(oData.Result, bCached);
if (collection) { if (collection) {
@ -387,7 +387,7 @@ MessagelistUserStore.removeMessagesFromList = (
if (MessagelistUserStore.threadUid()) { if (MessagelistUserStore.threadUid()) {
if ( if (
messageList.length && messageList.length &&
!!messageList.find(item => !!(item && item.deleted() && item.uid == MessagelistUserStore.threadUid())) messageList.find(item => item && item.deleted() && item.uid == MessagelistUserStore.threadUid())
) { ) {
const message = messageList.find(item => item && !item.deleted()); const message = messageList.find(item => item && !item.deleted());
let setHash; let setHash;