mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Small fix

This commit is contained in:
M66B 2019-03-17 09:38:00 +00:00
parent c1ccc52474
commit cc1264698c
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/eu/faircode/email/EntityMessage.java
View File

@ -190,17 +190,17 @@ public class EntityMessage implements Serializable {
if (obj instanceof EntityMessage) { if (obj instanceof EntityMessage) {
EntityMessage other = (EntityMessage) obj; EntityMessage other = (EntityMessage) obj;
return (true && return (true &&
//(this.account == null ? other.account == null : this.account.equals(other.account)) && // account
//this.folder.equals(other.folder) && // folder
//(this.identity == null ? other.identity == null : this.identity.equals(other.identity)) && Objects.equals(this.identity, other.identity) && // via
//(this.replying == null ? other.replying == null : this.replying.equals(other.replying)) &&
//(this.forwarding == null ? other.forwarding == null : this.forwarding.equals(other.forwarding)) &&
Objects.equals(this.uid, other.uid) && Objects.equals(this.uid, other.uid) &&
Objects.equals(this.msgid, other.msgid) && // debug info Objects.equals(this.msgid, other.msgid) && // debug info
//(this.references == null ? other.references == null : this.references.equals(other.references)) && // references
//(this.deliveredto == null ? other.deliveredto == null : this.deliveredto.equals(other.deliveredto)) && // deliveredto
//(this.inreplyto == null ? other.inreplyto == null : this.inreplyto.equals(other.inreplyto)) && // inreplyto
Objects.equals(this.thread, other.thread) && Objects.equals(this.thread, other.thread) &&
Objects.equals(this.avatar, other.avatar) &&
// sender
MessageHelper.equal(this.from, other.from) && MessageHelper.equal(this.from, other.from) &&
MessageHelper.equal(this.to, other.to) && MessageHelper.equal(this.to, other.to) &&
MessageHelper.equal(this.cc, other.cc) && MessageHelper.equal(this.cc, other.cc) &&
@ -212,12 +212,12 @@ public class EntityMessage implements Serializable {
Objects.equals(this.size, other.size) && Objects.equals(this.size, other.size) &&
this.content == other.content && this.content == other.content &&
Objects.equals(this.preview, other.preview) && Objects.equals(this.preview, other.preview) &&
//(this.sent == null ? other.sent == null : this.sent.equals(other.sent)) && // sent
this.received.equals(other.received) && this.received.equals(other.received) &&
this.stored.equals(other.stored) && // updated after decryption this.stored.equals(other.stored) && // updated after decryption
//this.seen.equals(other.seen) && // seen
//this.answered.equals(other.answered) && // answered
//this.flagged.equals(other.flagged) && // flagged
(!BuildConfig.DEBUG || Objects.equals(this.flags, other.flags)) && (!BuildConfig.DEBUG || Objects.equals(this.flags, other.flags)) &&
Helper.equal(this.keywords, other.keywords) && Helper.equal(this.keywords, other.keywords) &&
this.ui_seen.equals(other.ui_seen) && this.ui_seen.equals(other.ui_seen) &&
@ -230,6 +230,7 @@ public class EntityMessage implements Serializable {
Objects.equals(this.ui_snoozed, other.ui_snoozed) && Objects.equals(this.ui_snoozed, other.ui_snoozed) &&
Objects.equals(this.warning, other.warning) && Objects.equals(this.warning, other.warning) &&
Objects.equals(this.error, other.error) && Objects.equals(this.error, other.error) &&
// last_attempt
this.day == other.day); this.day == other.day);
} }
return false; return false;