Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 13:47:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added uuid to rules

Browse Source
This commit is contained in:
M66B
2022-06-27 08:57:35 +02:00
parent 258773cc9d
commit 825f800bf9
5 changed files with 2796 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/EntityRule.java
View File

@@ -56,6 +56,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.regex.Pattern;
@@ -83,6 +84,8 @@ public class EntityRule {
@PrimaryKey(autoGenerate = true)
public Long id;
@NonNull
public String uuid = UUID.randomUUID().toString();
@NonNull
public Long folder;
@NonNull
public String name;
@@ -1161,7 +1164,8 @@ public class EntityRule {
public boolean equals(Object obj) {
if (obj instanceof EntityRule) {
EntityRule other = (EntityRule) obj;
return this.folder.equals(other.folder) &&
return Objects.equals(this.uuid, other.uuid) &&
this.folder.equals(other.folder) &&
this.name.equals(other.name) &&
this.order == other.order &&
this.enabled == other.enabled &&
@@ -1212,6 +1216,7 @@ public class EntityRule {
public JSONObject toJSON() throws JSONException {
JSONObject json = new JSONObject();
json.put("id", id);
json.put("uuid", uuid);
json.put("name", name);
json.put("order", order);
json.put("enabled", enabled);
@@ -1226,6 +1231,8 @@ public class EntityRule {
public static EntityRule fromJSON(JSONObject json) throws JSONException {
EntityRule rule = new EntityRule();
// id
if (json.has("uuid"))
rule.uuid = json.getString("uuid");
rule.name = json.getString("name");
rule.order = json.getInt("order");
rule.enabled = json.getBoolean("enabled");