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

Fixed outgoing/self

This commit is contained in:
M66B 2021-01-25 08:45:46 +01:00
parent e27a613c95
commit ef2fcf5e33
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -911,8 +911,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean inbox = EntityFolder.INBOX.equals(message.folderType); boolean inbox = EntityFolder.INBOX.equals(message.folderType);
boolean outbox = EntityFolder.OUTBOX.equals(message.folderType); boolean outbox = EntityFolder.OUTBOX.equals(message.folderType);
boolean outgoing = isOutgoing(message); boolean outgoing = isOutgoing(message);
boolean reverse = (EntityFolder.isOutgoing(message.folderType) && boolean reverse = (!show_recipients && outgoing && (viewType != ViewType.THREAD || !threading));
(viewType != ViewType.THREAD || !threading) && !show_recipients);
Address[] senders = ContactInfo.fillIn(reverse ? message.to : message.senders, prefer_contact); Address[] senders = ContactInfo.fillIn(reverse ? message.to : message.senders, prefer_contact);
Address[] recipients = ContactInfo.fillIn(reverse ? message.from : message.recipients, prefer_contact); Address[] recipients = ContactInfo.fillIn(reverse ? message.from : message.recipients, prefer_contact);
boolean authenticated = boolean authenticated =
@ -2858,10 +2857,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private boolean isOutgoing(TupleMessageEx message) { private boolean isOutgoing(TupleMessageEx message) {
if (EntityFolder.isOutgoing(message.folderType)) if (EntityFolder.isOutgoing(message.folderType))
return true; return true;
else else {
return (message.identityEmail != null && if (message.identityEmail == null)
message.from != null && message.from.length == 1 && return false;
message.identityEmail.equalsIgnoreCase(((InternetAddress) message.from[0]).getAddress())); if (message.from == null)
return false;
for (Address from : message.from)
if (message.identityEmail.equalsIgnoreCase(((InternetAddress) from).getAddress()))
return true;
return false;
}
} }
private TupleMessageEx getMessage() { private TupleMessageEx getMessage() {