Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-26 23:50:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added folder colors

Browse Source
This commit is contained in:
M66B
2019-10-07 18:15:02 +02:00
parent 7057cdaf18
commit 0f133e9bed
10 changed files with 1976 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/EntityFolder.java
View File

@@ -87,6 +87,7 @@ public class EntityFolder extends EntityOrder implements Serializable {
@NonNull
public Boolean auto_delete = false;
public String display;
public Integer color;
@NonNull
public Boolean hide = false;
@NonNull
@@ -339,6 +340,7 @@ public class EntityFolder extends EntityOrder implements Serializable {
this.keep_days.equals(other.keep_days) &&
this.auto_delete.equals(other.auto_delete) &&
Objects.equals(this.display, other.display) &&
Objects.equals(this.color, other.color) &&
Objects.equals(this.order, other.order) &&
this.hide == other.hide &&
this.collapsed == other.collapsed &&
@@ -349,8 +351,8 @@ public class EntityFolder extends EntityOrder implements Serializable {
Helper.equal(this.keywords, other.keywords) &&
this.initialize.equals(other.initialize) &&
Objects.equals(this.tbc, other.tbc) &&
Objects.equals(this.rename, other.rename) &&
Objects.equals(this.tbd, other.tbd) &&
Objects.equals(this.rename, other.rename) &&
Objects.equals(this.state, other.state) &&
Objects.equals(this.sync_state, other.sync_state) &&
this.read_only == other.read_only &&
@@ -379,6 +381,7 @@ public class EntityFolder extends EntityOrder implements Serializable {
json.put("keep_days", keep_days);
json.put("auto_delete", auto_delete);
json.put("display", display);
json.put("color", color);
json.put("hide", hide);
json.put("collapsed", collapsed);
json.put("unified", unified);
@@ -422,6 +425,9 @@ public class EntityFolder extends EntityOrder implements Serializable {
if (json.has("display") && !json.isNull("display"))
folder.display = json.getString("display");
if (json.has("color") && !json.isNull("color"))
folder.color = json.getInt("color");
if (json.has("hide"))
folder.hide = json.getBoolean("hide");