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

Compare email address only of submitter

This commit is contained in:
M66B 2021-01-11 09:13:34 +01:00
parent 5d6b71dff6
commit 7edf30016e
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/Core.java
View File

@ -2163,7 +2163,7 @@ class Core {
message.ui_ignored = false; message.ui_ignored = false;
message.ui_browsed = false; message.ui_browsed = false;
if (MessageHelper.equal(message.submitter, message.from)) if (MessageHelper.equalEmail(message.submitter, message.from))
message.submitter = null; message.submitter = null;
if (message.size == null && message.total != null) if (message.size == null && message.total != null)
@ -2863,7 +2863,7 @@ class Core {
if (message.flagged) if (message.flagged)
message.color = color; message.color = color;
if (MessageHelper.equal(message.submitter, message.from)) if (MessageHelper.equalEmail(message.submitter, message.from))
message.submitter = null; message.submitter = null;
// Borrow reply name from sender name // Borrow reply name from sender name

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

@ -2707,6 +2707,23 @@ public class MessageHelper {
return Objects.equals(email1, email2); return Objects.equals(email1, email2);
} }
static boolean equalEmail(Address[] a1, Address[] a2) {
if (a1 == null && a2 == null)
return true;
if (a1 == null || a2 == null)
return false;
if (a1.length != a2.length)
return false;
for (int i = 0; i < a1.length; i++)
if (!equalEmail(a1[i], a2[i]))
return false;
return true;
}
static boolean equal(Address[] a1, Address[] a2) { static boolean equal(Address[] a1, Address[] a2) {
if (a1 == null && a2 == null) if (a1 == null && a2 == null)
return true; return true;