Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-16 14:03:33 +02: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

10
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@@ -1269,9 +1269,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
String selector = (reverse ? null : message.bimi_selector);
Address[] addresses = (reverse ? message.to : (message.isForwarder() ? message.submitter : message.from));
Address[] senders = ContactInfo.fillIn(
reverse && !show_recipients ? message.to : message.senders, prefer_contact, only_contact);
reverse && !show_recipients ? message.to : message.addresses[0], prefer_contact, only_contact);
Address[] recipients = ContactInfo.fillIn(
reverse && !show_recipients ? message.from : message.recipients, prefer_contact, only_contact);
reverse && !show_recipients ? message.from : message.addresses[1], prefer_contact, only_contact);
boolean authenticated =
!((Boolean.FALSE.equals(message.dkim) && check_authentication) ||
(Boolean.FALSE.equals(message.spf) && check_authentication) ||
@@ -2563,7 +2563,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean hasChannel = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O);
int maxRecipients = (compact ? MAX_RECIPIENTS_COMPACT : MAX_RECIPIENTS_NORMAL);
Spanned submitter = formatAddresses(message.submitter, true);
Spanned from = formatAddresses(message.senders, true);
Spanned from = formatAddresses(message.addresses[0], true);
grpAddresses.setVisibility(View.VISIBLE);
@@ -7841,7 +7841,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean outgoing = isOutgoing(message);
Address[] addresses = (EntityFolder.isOutgoing(message.folderType) &&
(viewType != ViewType.THREAD || !threading) ? message.to : message.senders);
(viewType != ViewType.THREAD || !threading) ? message.to : message.addresses[0]);
MessageHelper.AddressFormat format = email_format;
String from = MessageHelper.formatAddresses(addresses, format, false);
@@ -8617,7 +8617,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
keyPosition.put(message.id, i);
positionKey.put(i, message.id);
addExtra(message.from, message.extra);
addExtra(message.senders, message.extra);
addExtra(message.addresses[0], message.extra);
message.resolveLabelColors(context);
message.resolveKeywordColors(context);
}