Export/import receive before send

pull/215/head
M66B 7 months ago
parent 0794f275f9
commit 1a00102301

@ -225,6 +225,7 @@ public class EntityIdentity {
json.put("provider", provider); json.put("provider", provider);
json.put("user", user); json.put("user", user);
json.put("password", password); json.put("password", password);
json.put("login", login);
json.put("certificate_alias", certificate_alias); json.put("certificate_alias", certificate_alias);
json.put("realm", realm); json.put("realm", realm);
json.put("fingerprint", fingerprint); json.put("fingerprint", fingerprint);
@ -297,6 +298,7 @@ public class EntityIdentity {
identity.provider = json.getString("provider"); identity.provider = json.getString("provider");
identity.user = json.getString("user"); identity.user = json.getString("user");
identity.password = json.getString("password"); identity.password = json.getString("password");
identity.login = json.optBoolean("login");
if (json.has("certificate_alias") && !json.isNull("certificate_alias")) if (json.has("certificate_alias") && !json.isNull("certificate_alias"))
identity.certificate_alias = json.getString("certificate_alias"); identity.certificate_alias = json.getString("certificate_alias");
if (json.has("realm") && !json.isNull("realm")) if (json.has("realm") && !json.isNull("realm"))
@ -377,6 +379,7 @@ public class EntityIdentity {
Objects.equals(i1.provider, other.provider) && Objects.equals(i1.provider, other.provider) &&
i1.user.equals(other.user) && i1.user.equals(other.user) &&
(!auth || i1.password.equals(other.password)) && (!auth || i1.password.equals(other.password)) &&
// login
// certificate // certificate
Objects.equals(i1.certificate_alias, other.certificate_alias) && Objects.equals(i1.certificate_alias, other.certificate_alias) &&
Objects.equals(i1.realm, other.realm) && Objects.equals(i1.realm, other.realm) &&

Loading…
Cancel
Save