From 21030fd90b274a308b92cb96a0301bea9a490d16 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 5 Jan 2019 07:38:16 +0000 Subject: [PATCH] Export folder download flag --- .../main/java/eu/faircode/email/EntityFolder.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java index 71c58db654..db057932d4 100644 --- a/app/src/main/java/eu/faircode/email/EntityFolder.java +++ b/app/src/main/java/eu/faircode/email/EntityFolder.java @@ -76,8 +76,6 @@ public class EntityFolder implements Serializable { public Integer sync_days; @NonNull public Integer keep_days; - @NonNull - public Boolean initialize = true; public String display; @NonNull public Boolean hide = false; @@ -86,6 +84,9 @@ public class EntityFolder implements Serializable { @NonNull public Boolean notify = false; public String[] keywords; + + @NonNull + public Boolean initialize = true; public Boolean tbc; // to be created public Boolean tbd; // to be deleted public String state; @@ -188,6 +189,7 @@ public class EntityFolder implements Serializable { this.level.equals(other.level) && this.synchronize.equals(other.synchronize) && this.poll.equals(other.poll) && + this.download.equals(other.download) && this.sync_days.equals(other.sync_days) && this.keep_days.equals(other.keep_days) && (this.display == null ? other.display == null : this.display.equals(other.display)) && @@ -216,6 +218,7 @@ public class EntityFolder implements Serializable { json.put("level", level); json.put("synchronize", synchronize); json.put("poll", poll); + json.put("download", download); json.put("sync_days", sync_days); json.put("keep_days", keep_days); json.put("display", display); @@ -236,10 +239,12 @@ public class EntityFolder implements Serializable { folder.level = 0; folder.synchronize = json.getBoolean("synchronize"); + if (json.has("poll")) folder.poll = json.getBoolean("poll"); - else - folder.poll = false; + + if (json.has("download")) + folder.download = json.getBoolean("download"); if (json.has("after")) folder.sync_days = json.getInt("after");