Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 03:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Combined two sub queries

Browse Source
This commit is contained in:
M66B
2023-12-19 13:39:05 +01:00
parent be926fcc9a
commit 922b4dfb31
4 changed files with 57 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3116,14 +3116,8 @@ public abstract class DB extends RoomDatabase {
List<Address> result = new ArrayList<>();
try {
JSONArray jroot = new JSONArray(json);
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++)
result.add(InternetAddressJson.from((JSONObject) ((JSONArray) item).get(j)));
else
result.add(InternetAddressJson.from((JSONObject) item));
}
for (int i = 0; i < jroot.length(); i++)
result.addAll(getAddresses(jroot.get(i)));
} catch (Throwable ex) {
// Compose can store invalid addresses
Log.w(ex);
@@ -3131,6 +3125,46 @@ public abstract class DB extends RoomDatabase {
return result.toArray(new Address[0]);
}
@TypeConverter
public static Address[][] decodeAddressesArray(String json) {
if (json == null)
return new Address[][]{new Address[0], new Address[0]};
List<Address> senders = new ArrayList<>();
List<Address> recipients = new ArrayList<>();
try {
JSONArray jroot = new JSONArray(json);
senders.addAll(getAddresses(jroot.get(0)));
recipients.addAll(getAddresses(jroot.get(1)));
} catch (Throwable ex) {
Log.w(ex);
}
return new Address[][]{
senders.toArray(new Address[0]),
recipients.toArray(new Address[0])
};
}
private static List<Address> getAddresses(Object item) {
List<Address> result = new ArrayList<>();
if (item instanceof JSONArray)
for (int j = 0; j < ((JSONArray) item).length(); j++)
try {
result.add(InternetAddressJson.from((JSONObject) ((JSONArray) item).get(j)));
} catch (Throwable ex) {
// Compose can store invalid addresses
Log.w(ex);
}
else
try {
result.add(InternetAddressJson.from((JSONObject) item));
} catch (Throwable ex) {
// Compose can store invalid addresses
Log.w(ex);
}
return result;
}
@TypeConverter
public static EntityLog.Type toLogType(int ordinal) {
return EntityLog.Type.values()[ordinal];