mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Small address JSON fixes

This commit is contained in:
M66B 2020-05-07 11:17:23 +02:00
parent cac5bae40b
commit cd6986ac7e
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/eu/faircode/email/DB.java
View File

@ -1635,19 +1635,24 @@ public abstract class DB extends RoomDatabase {
@TypeConverter
public static Address[] decodeAddresses(String json) {
if (json == null)
try {
if (TextUtils.isEmpty(json))
return null;
else if (json.startsWith("[[")) {
// [[{"address":"...","personal":"..."}],[{... ...}]]
// There is a slim chance somebody uses the split pattern in an email address
String[] parts = json.substring(3, json.length() - 3).split(JSPLIT);
Address[] addresses = new Address[parts.length];
for (int i = 0; i < parts.length; i++)
addresses[i] = InternetAddressJson.from(parts[i]);
return addresses;
} else {
// [{"address":"...","personal":"..."}]
return new Address[]{InternetAddressJson.from(json.substring(2, json.length() - 2))};
}
} catch (Throwable ex) {
Log.e(ex);
return null;
else if (json.startsWith("[[")) {
// [[{"address":"...","personal":"..."}],[{... ...}]]
// There is a slim chance somebody uses the split pattern in an email address
String[] parts = json.substring(3, json.length() - 3).split(JSPLIT);
Address[] addresses = new Address[parts.length];
for (int i = 0; i < parts.length; i++)
addresses[i] = InternetAddressJson.from(parts[i]);
return addresses;
} else {
// [{"address":"...","personal":"..."}]
return new Address[]{InternetAddressJson.from(json.substring(2, json.length() - 2))};
}
}
}

2
app/src/main/java/eu/faircode/email/InternetAddressJson.java
View File

@ -106,7 +106,7 @@ public class InternetAddressJson extends InternetAddress {
if (this.json != null) {
try {
JSONObject jaddress = new JSONObject("{" + this.json + "}");
String address = jaddress.getString("address");
String address = jaddress.optString("address");
String personal = jaddress.optString("personal");
if (!TextUtils.isEmpty(address))
super.setAddress(address);