Export/import account/folder order

app/src/main/java/eu/faircode/email/EntityAccount.java

@@ -141,6 +141,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
     public JSONObject toJSON() throws JSONException {
         JSONObject json = new JSONObject();
         json.put("id", id);
+        json.put("order", order);
         json.put("auth_type", auth_type);
         json.put("host", host);
         json.put("starttls", starttls);
@@ -173,6 +174,10 @@ public class EntityAccount extends EntityOrder implements Serializable {
     public static EntityAccount fromJSON(JSONObject json) throws JSONException {
         EntityAccount account = new EntityAccount();
         // id
+
+        if (json.has("order"))
+            account.order = json.getInt("order");
+
         account.auth_type = json.getInt("auth_type");
         account.host = json.getString("host");
         account.starttls = (json.has("starttls") && json.getBoolean("starttls"));

app/src/main/java/eu/faircode/email/EntityFolder.java

@@ -312,6 +312,7 @@ public class EntityFolder extends EntityOrder implements Serializable {
     public JSONObject toJSON() throws JSONException {
         JSONObject json = new JSONObject();
         json.put("id", id);
+        json.put("order", order);
         json.put("name", name);
         json.put("type", type);
         json.put("synchronize", synchronize);
@@ -333,6 +334,9 @@ public class EntityFolder extends EntityOrder implements Serializable {
         if (json.has("id"))
             folder.id = json.getLong("id");
 
+        if (json.has("order"))
+            folder.order = json.getInt("order");
+
         folder.name = json.getString("name");
         folder.type = json.getString("type");