mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-29 20:19:22 +03:00
Bugfix: revamp MessageModel broke flags cache
And took the liberty to put all MessageFlagsCache functions into a class
This commit is contained in:
parent
d7a4639d6b
commit
22f606ea75
9 changed files with 157 additions and 161 deletions
|
|
@ -415,12 +415,7 @@ class MessageModel extends AbstractModel {
|
|||
this.hash = message.hash;
|
||||
this.requestHash = message.requestHash;
|
||||
this.subject(message.subject());
|
||||
}
|
||||
|
||||
this.subjectPrefix(this.subjectPrefix());
|
||||
this.subjectSuffix(this.subjectSuffix());
|
||||
|
||||
if (message) {
|
||||
this.size(message.size());
|
||||
this.dateTimeStampInUTC(message.dateTimeStampInUTC());
|
||||
this.priority(message.priority());
|
||||
|
|
@ -450,6 +445,9 @@ class MessageModel extends AbstractModel {
|
|||
this.checked(message.checked());
|
||||
this.hasAttachments(message.hasAttachments());
|
||||
this.attachmentsSpecData(message.attachmentsSpecData());
|
||||
|
||||
this.subjectPrefix(this.subjectPrefix());
|
||||
this.subjectSuffix(this.subjectSuffix());
|
||||
}
|
||||
|
||||
this.body = null;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@ import { AbstractCollectionModel } from 'Model/AbstractCollection';
|
|||
import { MessageModel } from 'Model/Message';
|
||||
|
||||
import {
|
||||
initMessageFlagsFromCache,
|
||||
storeMessageFlagsToCache,
|
||||
MessageFlagsCache,
|
||||
hasNewMessageAndRemoveFromCache
|
||||
} from 'Common/Cache';
|
||||
|
||||
|
|
@ -45,7 +44,7 @@ export class MessageCollectionModel extends AbstractCollectionModel
|
|||
|
||||
message.deleted(false);
|
||||
|
||||
cached ? initMessageFlagsFromCache(message) : storeMessageFlagsToCache(message);
|
||||
cached ? MessageFlagsCache.initMessage(message) : MessageFlagsCache.store(message);
|
||||
return message;
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue