Added certificate selection

This commit is contained in:
M66B
2020-02-10 16:35:14 +01:00
parent 8d3ec9aa43
commit 94a9e05da5
15 changed files with 2310 additions and 69 deletions

View File

@@ -78,7 +78,8 @@ public class EntityAccount extends EntityOrder implements Serializable {
@NonNull
public String password;
@NonNull
public Boolean certificate;
public Boolean certificate; // obsolete
public String certificate_alias;
public String realm;
public String fingerprint;
@@ -197,7 +198,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
json.put("provider", provider);
json.put("user", user);
json.put("password", password);
json.put("certificate", certificate);
json.put("certificate_alias", certificate_alias);
json.put("realm", realm);
json.put("fingerprint", fingerprint);
@@ -256,7 +257,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
account.provider = json.getString("provider");
account.user = json.getString("user");
account.password = json.getString("password");
account.certificate = json.optBoolean("certificate");
account.certificate_alias = json.getString("certificate_alias");
if (json.has("realm"))
account.realm = json.getString("realm");
if (json.has("fingerprint"))