Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-02 19:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bringing back XOAuth2

Browse Source
This commit is contained in:
M66B
2019-09-18 16:34:07 +02:00
parent df2005dfc1
commit 27d7eddddc
20 changed files with 486 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,16 +57,16 @@ public class EntityIdentity {
public Integer color;
public String signature;
@NonNull
public Integer auth_type;
@NonNull
public String host; // SMTP
@NonNull
public Boolean starttls;
@NonNull
public Boolean insecure;
public Boolean insecure = false;
@NonNull
public Integer port;
@NonNull
public Integer auth_type;
@NonNull
public String user;
@NonNull
public String password;
@@ -113,11 +113,11 @@ public class EntityIdentity {
json.put("signature", signature);
// not account
json.put("auth_type", auth_type);
json.put("host", host);
json.put("starttls", starttls);
json.put("insecure", insecure);
json.put("port", port);
json.put("auth_type", auth_type);
json.put("user", user);
json.put("password", password);
json.put("realm", realm);
@@ -151,11 +151,11 @@ public class EntityIdentity {
if (json.has("signature") && !json.isNull("signature"))
identity.signature = json.getString("signature");
identity.auth_type = json.getInt("auth_type");
identity.host = json.getString("host");
identity.starttls = json.getBoolean("starttls");
identity.insecure = (json.has("insecure") && json.getBoolean("insecure"));
identity.port = json.getInt("port");
identity.auth_type = json.getInt("auth_type");
identity.user = json.getString("user");
identity.password = json.getString("password");
if (json.has("realm") && !json.isNull("realm"))
@@ -196,11 +196,11 @@ public class EntityIdentity {
Objects.equals(this.display, other.display) &&
Objects.equals(this.color, other.color) &&
Objects.equals(this.signature, other.signature) &&
this.auth_type.equals(other.auth_type) &&
this.host.equals(other.host) &&
this.starttls.equals(other.starttls) &&
this.insecure.equals(other.insecure) &&
this.port.equals(other.port) &&
this.auth_type.equals(other.auth_type) &&
this.user.equals(other.user) &&
this.password.equals(other.password) &&
Objects.equals(this.realm, other.realm) &&