Browse Source

Fixed equals

main
M66B 6 years ago
parent
commit
fe1e43ad27
4 changed files with 19 additions and 19 deletions
  1. +1
    -1
      app/src/main/java/eu/faircode/email/EntityAccount.java
  2. +1
    -1
      app/src/main/java/eu/faircode/email/EntityFolder.java
  3. +1
    -1
      app/src/main/java/eu/faircode/email/EntityIdentity.java
  4. +16
    -16
      app/src/main/java/eu/faircode/email/EntityMessage.java

+ 1
- 1
app/src/main/java/eu/faircode/email/EntityAccount.java View File

@ -51,7 +51,7 @@ public class EntityAccount {
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj instanceof EntityAccount) { if (obj instanceof EntityAccount) {
EntityAccount other = (EntityAccount) obj; EntityAccount other = (EntityAccount) obj;
return (this.name == null ? other.name == null : this.name.equals(other.name) &&
return ((this.name == null ? other.name == null : this.name.equals(other.name)) &&
this.host.equals(other.host) && this.host.equals(other.host) &&
this.port.equals(other.port) && this.port.equals(other.port) &&
this.user.equals(other.user) && this.user.equals(other.user) &&


+ 1
- 1
app/src/main/java/eu/faircode/email/EntityFolder.java View File

@ -93,7 +93,7 @@ public class EntityFolder {
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj instanceof EntityFolder) { if (obj instanceof EntityFolder) {
EntityFolder other = (EntityFolder) obj; EntityFolder other = (EntityFolder) obj;
return (this.account == null ? other.account == null : this.account.equals(other.account) &&
return ((this.account == null ? other.account == null : this.account.equals(other.account)) &&
this.name.equals(other.name) && this.name.equals(other.name) &&
this.type.equals(other.type) && this.type.equals(other.type) &&
this.synchronize.equals(other.synchronize) && this.synchronize.equals(other.synchronize) &&


+ 1
- 1
app/src/main/java/eu/faircode/email/EntityIdentity.java View File

@ -59,7 +59,7 @@ public class EntityIdentity {
EntityIdentity other = (EntityIdentity) obj; EntityIdentity other = (EntityIdentity) obj;
return (this.name.equals(other.name) && return (this.name.equals(other.name) &&
this.email.equals(other.email) && this.email.equals(other.email) &&
this.replyto == null ? other.replyto == null : this.replyto.equals(other.replyto) &&
(this.replyto == null ? other.replyto == null : this.replyto.equals(other.replyto)) &&
this.host.equals(other.host) && this.host.equals(other.host) &&
this.port.equals(other.port) && this.port.equals(other.port) &&
this.starttls.equals(other.starttls) && this.starttls.equals(other.starttls) &&


+ 16
- 16
app/src/main/java/eu/faircode/email/EntityMessage.java View File

@ -84,23 +84,23 @@ public class EntityMessage {
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj instanceof EntityMessage) { if (obj instanceof EntityMessage) {
EntityMessage other = (EntityMessage) obj; EntityMessage other = (EntityMessage) obj;
return (this.account == null ? other.account == null : this.account.equals(other.account) &&
return ((this.account == null ? other.account == null : this.account.equals(other.account)) &&
this.folder.equals(other.folder) && this.folder.equals(other.folder) &&
this.identity == null ? other.identity == null : this.identity.equals(other.identity) &&
this.replying == null ? other.replying == null : this.replying.equals(other.replying) &&
this.uid == null ? other.uid == null : this.uid.equals(other.uid) &&
this.msgid == null ? other.msgid == null : this.msgid.equals(other.msgid) &&
this.references == null ? other.references == null : this.references.equals(other.references) &&
this.inreplyto == null ? other.inreplyto == null : this.inreplyto.equals(other.inreplyto) &&
this.thread == null ? other.thread == null : thread.equals(other.thread) &&
this.from == null ? other.from == null : this.from.equals(other.from) &&
this.to == null ? other.to == null : this.to.equals(other.to) &&
this.cc == null ? other.cc == null : this.cc.equals(other.cc) &&
this.bcc == null ? other.bcc == null : this.bcc.equals(other.bcc) &&
this.reply == null ? other.reply == null : this.reply.equals(other.reply) &&
this.subject == null ? other.subject == null : this.subject.equals(other.subject) &&
this.body == null ? other.body == null : this.body.equals(other.body) &&
this.sent == null ? other.sent == null : this.sent.equals(other.sent) &&
(this.identity == null ? other.identity == null : this.identity.equals(other.identity)) &&
(this.replying == null ? other.replying == null : this.replying.equals(other.replying)) &&
(this.uid == null ? other.uid == null : this.uid.equals(other.uid)) &&
(this.msgid == null ? other.msgid == null : this.msgid.equals(other.msgid)) &&
(this.references == null ? other.references == null : this.references.equals(other.references)) &&
(this.inreplyto == null ? other.inreplyto == null : this.inreplyto.equals(other.inreplyto)) &&
(this.thread == null ? other.thread == null : thread.equals(other.thread)) &&
(this.from == null ? other.from == null : this.from.equals(other.from)) &&
(this.to == null ? other.to == null : this.to.equals(other.to)) &&
(this.cc == null ? other.cc == null : this.cc.equals(other.cc)) &&
(this.bcc == null ? other.bcc == null : this.bcc.equals(other.bcc)) &&
(this.reply == null ? other.reply == null : this.reply.equals(other.reply)) &&
(this.subject == null ? other.subject == null : this.subject.equals(other.subject)) &&
(this.body == null ? other.body == null : this.body.equals(other.body)) &&
(this.sent == null ? other.sent == null : this.sent.equals(other.sent)) &&
this.received.equals(other.received) && this.received.equals(other.received) &&
this.seen.equals(other.seen) && this.seen.equals(other.seen) &&
this.ui_seen.equals(other.ui_seen) && this.ui_seen.equals(other.ui_seen) &&


Loading…
Cancel
Save