From ed881a42adb85b26d9c8931cb92d6b0438a900ff Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 7 Oct 2018 08:08:01 +0000
Subject: [PATCH] Refactoring

---
 app/src/main/java/eu/faircode/email/EntityAccount.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index 42832edd..e1e7f7b9 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -75,7 +75,6 @@ public class EntityAccount {
                     this.synchronize.equals(other.synchronize) &&
                     this.primary.equals(other.primary) &&
                     (this.color == null ? other.color == null : this.color.equals(other.color)) &&
-                    this.store_sent.equals(other.store_sent) &&
                     this.poll_interval.equals(other.poll_interval) &&
                     (this.seen_until == null ? other.seen_until == null : this.seen_until.equals(other.seen_until)) &&
                     (this.state == null ? other.state == null : this.state.equals(other.state)) &&
@@ -93,8 +92,8 @@ public class EntityAccount {
         json.put("user", user);
         json.put("password", "");
         json.put("auth_type", auth_type);
-        json.put("primary", primary);
         json.put("synchronize", false);
+        json.put("primary", primary);
         if (color != null)
             json.put("color", color);
         json.put("poll_interval", poll_interval);
@@ -112,8 +111,8 @@ public class EntityAccount {
         account.user = json.getString("user");
         account.password = json.getString("password");
         account.auth_type = json.getInt("auth_type");
-        account.primary = json.getBoolean("primary");
         account.synchronize = json.getBoolean("synchronize");
+        account.primary = json.getBoolean("primary");
         if (json.has("color"))
             account.color = json.getInt("color");
         account.poll_interval = json.getInt("poll_interval");