Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-25 23:20:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added identity display name and default bcc

Browse Source
This commit is contained in:
M66B
2018-12-10 16:45:52 +01:00
parent bb9068aa0d
commit d5dc15884e
8 changed files with 1334 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,9 +47,11 @@ public class EntityIdentity {
public Long id;
@NonNull
public String name;
public String display;
@NonNull
public String email;
public String replyto;
public String bcc;
@NonNull
public Boolean delivery_receipt;
@NonNull
@@ -86,8 +88,10 @@ public class EntityIdentity {
public JSONObject toJSON() throws JSONException {
JSONObject json = new JSONObject();
json.put("name", name);
json.put("display", display);
json.put("email", email);
json.put("replyto", replyto);
json.put("bcc", bcc);
json.put("delivery_receipt", delivery_receipt);
json.put("read_receipt", read_receipt);
// not account
@@ -114,11 +118,18 @@ public class EntityIdentity {
public static EntityIdentity fromJSON(JSONObject json) throws JSONException {
EntityIdentity identity = new EntityIdentity();
identity.name = json.getString("name");
if (json.has("display"))
identity.display = json.getString("display");
identity.email = json.getString("email");
if (json.has("replyto"))
identity.replyto = json.getString("replyto");
if (json.has("bcc"))
identity.replyto = json.getString("bcc");
if (json.has("delivery_receipt"))
identity.delivery_receipt = json.getBoolean("delivery_receipt");
else
@@ -179,8 +190,12 @@ public class EntityIdentity {
return false;
}
String getDisplayName() {
return (display == null ? name : display);
}
@Override
public String toString() {
return name + (primary ? " ★" : "");
return getDisplayName() + (primary ? " ★" : "");
}
}