From b3da7650b01fbe6dd5d92c4f9e84eb27c948b098 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 14 Nov 2018 20:00:38 +0100
Subject: [PATCH] Revert "Revert "Export/import passwords""

This reverts commit 4e04df2c850993c38d7fe0772b7d21133bd8e9b0.

Conflicts:
	app/src/main/java/eu/faircode/email/EntityIdentity.java
	app/src/main/res/values/strings.xml
---
 .idea/caches/build_file_checksums.ser           | Bin 588 -> 588 bytes
 .../java/eu/faircode/email/EntityAccount.java   |   4 ++--
 .../java/eu/faircode/email/EntityIdentity.java  |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 6e9d5dfdc32bcd2fab11daf228499aa5777408a4..1bd76f68edddac8b65b0968f54f889db65b2eecf 100644
GIT binary patch
delta 35
tcmV+;0Nnq~1k41GnFGX?7qOgi0T6}c>{-!3p_Gwn+M^1b4ce0(0xu?w59I&=

delta 35
rcmX@Za)xEXOy<7Cvm56WG71Pjb?`c|@`ob(3;E`v={ePtWtsE=79I}7

diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index 6848d643bb..e1ddc6b13c 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -71,9 +71,9 @@ public class EntityAccount {
         json.put("insecure", insecure);
         json.put("port", port);
         json.put("user", user);
-        json.put("password", "");
+        json.put("password", password);
         json.put("auth_type", auth_type);
-        json.put("synchronize", false);
+        json.put("synchronize", synchronize);
         json.put("primary", primary);
         if (color != null)
             json.put("color", color);
diff --git a/app/src/main/java/eu/faircode/email/EntityIdentity.java b/app/src/main/java/eu/faircode/email/EntityIdentity.java
index 6647a9e838..ab4b7feb89 100644
--- a/app/src/main/java/eu/faircode/email/EntityIdentity.java
+++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java
@@ -89,13 +89,13 @@ public class EntityIdentity {
         json.put("insecure", insecure);
         json.put("port", port);
         json.put("user", user);
-        json.put("password", "");
+        json.put("password", password);
         json.put("auth_type", auth_type);
         json.put("primary", primary);
         if (color != null)
             json.put("color", color);
         json.put("signature", signature);
-        json.put("synchronize", false);
+        json.put("synchronize", synchronize);
         json.put("store_sent", store_sent);
         if (sent_folder != null)
             json.put("sent_folder", sent_folder);