Browse Source

Fixed import/export

main
M66B 5 years ago
parent
commit
77fabb2d37
3 changed files with 8 additions and 0 deletions
  1. +4
    -0
      app/src/main/java/eu/faircode/email/EntityAccount.java
  2. +2
    -0
      app/src/main/java/eu/faircode/email/EntityIdentity.java
  3. +2
    -0
      app/src/main/java/eu/faircode/email/FragmentSetup.java

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

@ -91,6 +91,8 @@ public class EntityAccount {
json.put("name", name); json.put("name", name);
json.put("signature", signature); json.put("signature", signature);
json.put("host", host); json.put("host", host);
json.put("starttls", starttls);
json.put("insecure", insecure);
json.put("port", port); json.put("port", port);
json.put("user", user); json.put("user", user);
json.put("password", ""); json.put("password", "");
@ -110,6 +112,8 @@ public class EntityAccount {
if (json.has("signature")) if (json.has("signature"))
account.signature = json.getString("signature"); account.signature = json.getString("signature");
account.host = json.getString("host"); account.host = json.getString("host");
account.starttls = (json.has("starttls") && json.getBoolean("starttls"));
account.insecure = (json.has("insecure") && json.getBoolean("insecure"));
account.port = json.getInt("port"); account.port = json.getInt("port");
account.user = json.getString("user"); account.user = json.getString("user");
account.password = json.getString("password"); account.password = json.getString("password");


+ 2
- 0
app/src/main/java/eu/faircode/email/EntityIdentity.java View File

@ -82,6 +82,7 @@ public class EntityIdentity {
json.put("host", host); json.put("host", host);
json.put("port", port); json.put("port", port);
json.put("starttls", starttls); json.put("starttls", starttls);
json.put("insecure", insecure);
json.put("user", user); json.put("user", user);
json.put("password", ""); json.put("password", "");
json.put("auth_type", auth_type); json.put("auth_type", auth_type);
@ -100,6 +101,7 @@ public class EntityIdentity {
identity.host = json.getString("host"); identity.host = json.getString("host");
identity.port = json.getInt("port"); identity.port = json.getInt("port");
identity.starttls = json.getBoolean("starttls"); identity.starttls = json.getBoolean("starttls");
identity.insecure = (json.has("insecure") && json.getBoolean("insecure"));
identity.user = json.getString("user"); identity.user = json.getString("user");
identity.password = json.getString("password"); identity.password = json.getString("password");
identity.auth_type = json.getInt("auth_type"); identity.auth_type = json.getInt("auth_type");


+ 2
- 0
app/src/main/java/eu/faircode/email/FragmentSetup.java View File

@ -106,6 +106,8 @@ public class FragmentSetup extends FragmentEx {
"light", "light",
"browse", "browse",
"swipe", "swipe",
"compat",
"insecure",
"sort" "sort"
); );


Loading…
Cancel
Save