mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Export/import passwords" 

This reverts commit 124f97bf56.
This commit is contained in:
M66B 2018-11-14 10:57:21 +01:00
parent 85f860467d
commit 4e04df2c85
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/EntityAccount.java
View File

@ -72,9 +72,9 @@ public class EntityAccount {
json.put("insecure", insecure);
json.put("port", port);
json.put("user", user);
json.put("password", password);
json.put("password", "");
json.put("auth_type", auth_type);
json.put("synchronize", synchronize);
json.put("synchronize", false);
json.put("primary", primary);
if (color != null)
json.put("color", color);

4
app/src/main/java/eu/faircode/email/EntityIdentity.java
View File

@ -88,12 +88,12 @@ public class EntityIdentity {
json.put("insecure", insecure);
json.put("port", port);
json.put("user", user);
json.put("password", password);
json.put("password", "");
json.put("auth_type", auth_type);
json.put("primary", primary);
if (color != null)
json.put("color", color);
json.put("synchronize", synchronize);
json.put("synchronize", false);
json.put("store_sent", store_sent);
if (sent_folder != null)
json.put("sent_folder", sent_folder);

2
app/src/main/res/values/strings.xml
View File

@ -70,7 +70,7 @@
<string name="title_setup">Setup</string>
<string name="title_setup_export">Export settings</string>
<string name="title_setup_import">Import settings</string>
<string name="title_setup_export_do">The export file will contain your passwords, so keep it safe</string>
<string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
<string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
<string name="title_setup_exported">Settings exported</string>
<string name="title_setup_imported">Settings imported</string>