Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-27 03:15:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

use Objects.equals

Browse Source
This commit is contained in:
Unpublished
2019-02-26 11:05:21 +01:00
parent 1804e75911
commit 67751bfff5
18 changed files with 120 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/TupleRuleEx.java
View File

@@ -19,6 +19,8 @@ package eu.faircode.email;
Copyright 2018-2019 by Marcel Bokhorst (M66B)
*/
import java.util.Objects;
public class TupleRuleEx extends EntityRule {
public long account;
public String folderName;
@@ -30,8 +32,8 @@ public class TupleRuleEx extends EntityRule {
TupleRuleEx other = (TupleRuleEx) obj;
return (super.equals(obj) &&
this.account == other.account &&
(this.folderName == null ? other.folderName == null : this.folderName.equals(other.folderName)) &&
(this.accountName == null ? other.accountName == null : this.accountName.equals(other.accountName)));
Objects.equals(this.folderName, other.folderName) &&
Objects.equals(this.accountName, other.accountName));
} else
return false;
}