Added calendar selection

This commit is contained in:
M66B
2022-11-01 18:57:37 +01:00
parent 32c15e7800
commit dae313849d
8 changed files with 3002 additions and 7 deletions

View File

@@ -100,6 +100,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
public String category;
public String signature; // obsolete
public Integer color;
public String calendar;
@NonNull
public Boolean synchronize;
@@ -287,6 +288,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
json.put("name", name);
json.put("category", category);
json.put("color", color);
json.put("calendar", calendar);
json.put("synchronize", synchronize);
json.put("ondemand", ondemand);
@@ -366,6 +368,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
account.category = json.getString("category");
if (json.has("color"))
account.color = json.getInt("color");
account.calendar = json.optString("calendar", null);
account.synchronize = json.getBoolean("synchronize");
if (json.has("ondemand"))
@@ -427,6 +430,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
Objects.equals(this.name, other.name) &&
Objects.equals(this.category, other.category) &&
Objects.equals(this.color, other.color) &&
Objects.equals(this.calendar, other.calendar) &&
this.synchronize.equals(other.synchronize) &&
this.primary.equals(other.primary) &&
this.notify.equals(other.notify) &&