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

Lazily load addresses

Browse Source
This commit is contained in:
M66B
2020-05-08 08:15:39 +02:00
parent c749c07de8
commit e64825e5c6
2 changed files with 119 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ import org.json.JSONObject;
import java.io.File;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -1635,25 +1634,17 @@ public abstract class DB extends RoomDatabase {
public static Address[] decodeAddresses(String json) {
if (json == null)
return null;
List<Address> result = new ArrayList<>();
try {
JSONArray jroot = new JSONArray(json);
JSONArray jaddresses = new JSONArray();
for (int i = 0; i < jroot.length(); i++) {
Object item = jroot.get(i);
if (jroot.get(i) instanceof JSONArray)
for (int j = 0; j < ((JSONArray) item).length(); j++)
jaddresses.put(((JSONArray) item).get(j));
result.add(InternetAddressJson.from((JSONObject) ((JSONArray) item).get(j)));
else
jaddresses.put(item);
}
for (int i = 0; i < jaddresses.length(); i++) {
JSONObject jaddress = (JSONObject) jaddresses.get(i);
String email = jaddress.getString("address");
String personal = jaddress.optString("personal");
if (TextUtils.isEmpty(personal))
personal = null;
result.add(new InternetAddress(email, personal, StandardCharsets.UTF_8.name()));
result.add(InternetAddressJson.from((JSONObject) item));
}
} catch (Throwable ex) {
// Compose can store invalid addresses