mirror of
https://github.com/M66B/FairEmail.git
synced 2026-03-31 22:26:06 +02:00
Added rule groups
This commit is contained in:
@@ -92,6 +92,7 @@ public class EntityRule {
|
||||
public Long folder;
|
||||
@NonNull
|
||||
public String name;
|
||||
public String group;
|
||||
@NonNull
|
||||
public int order;
|
||||
@NonNull
|
||||
@@ -1388,6 +1389,7 @@ public class EntityRule {
|
||||
return Objects.equals(this.uuid, other.uuid) &&
|
||||
this.folder.equals(other.folder) &&
|
||||
this.name.equals(other.name) &&
|
||||
Objects.equals(this.group, other.group) &&
|
||||
this.order == other.order &&
|
||||
this.enabled == other.enabled &&
|
||||
this.daily == other.daily &&
|
||||
@@ -1440,6 +1442,7 @@ public class EntityRule {
|
||||
json.put("id", id);
|
||||
json.put("uuid", uuid);
|
||||
json.put("name", name);
|
||||
json.put("group", group);
|
||||
json.put("order", order);
|
||||
json.put("enabled", enabled);
|
||||
json.put("daily", daily);
|
||||
@@ -1457,6 +1460,7 @@ public class EntityRule {
|
||||
if (json.has("uuid"))
|
||||
rule.uuid = json.getString("uuid");
|
||||
rule.name = json.getString("name");
|
||||
rule.group = json.getString("group");
|
||||
rule.order = json.getInt("order");
|
||||
rule.enabled = json.getBoolean("enabled");
|
||||
rule.daily = json.optBoolean("daily");
|
||||
|
||||
Reference in New Issue
Block a user