mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-23 14:41:08 +00:00
Code Issues Releases Wiki Activity

Added identity logging

Browse source
This commit is contained in:
M66B 2023-06-18 19:03:29 +02:00
parent 0361f79f57
commit d369cccdf3
1 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/eu/faircode/email/Core.java
View file

@ -4944,6 +4944,10 @@ class Core {
if (EntityFolder.DRAFTS.equals(folder.type)) if (EntityFolder.DRAFTS.equals(folder.type))
return null; return null;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int level = prefs.getInt("log_level", android.util.Log.INFO);
boolean log = (level <= android.util.Log.INFO || BuildConfig.DEBUG);
List<Address> addresses = new ArrayList<>(); List<Address> addresses = new ArrayList<>();
if (folder.isOutgoing()) { if (folder.isOutgoing()) {
if (message.from != null) if (message.from != null)
@ -4972,20 +4976,46 @@ class Core {
if (identities != null) { if (identities != null) {
for (Address address : addresses) for (Address address : addresses)
for (EntityIdentity identity : identities) for (EntityIdentity identity : identities)
if (identity.sameAddress(address)) if (identity.sameAddress(address)) {
if (log)
Log.i("Matched same" +
" identity=" + identity.email +
" address=" + ((InternetAddress) address).getAddress() +
" folder=" + folder.name);
return identity; return identity;
}
for (Address address : addresses) for (Address address : addresses)
for (EntityIdentity identity : identities) for (EntityIdentity identity : identities)
if (identity.similarAddress(address)) if (identity.similarAddress(address)) {
if (log)
Log.i("Matched similar" +
" identity=" + identity.email +
" regex=" + identity.sender_extra_regex +
" address=" + ((InternetAddress) address).getAddress() +
" folder=" + folder.name);
return identity; return identity;
}
if (deliveredto != null) if (deliveredto != null)
for (EntityIdentity identity : identities) for (EntityIdentity identity : identities)
if (identity.sameAddress(deliveredto) || identity.similarAddress(deliveredto)) if (identity.sameAddress(deliveredto) || identity.similarAddress(deliveredto)) {
if (log)
Log.i("Matched deliveredto" +
" identity=" + identity.email +
" regex=" + identity.sender_extra_regex +
" address=" + ((InternetAddress) deliveredto).getAddress() +
" folder=" + folder.name);
return identity; return identity;
}
} }
if (log)
Log.i("Matched none" +
" addresses=" + MessageHelper.formatAddresses(addresses.toArray(new Address[0])) +
" deliveredto=" + (deliveredto == null ? null : ((InternetAddress) deliveredto).getAddress()) +
" folder=" + folder.name);
return null; return null;
} }