|
|
|
@ -5182,10 +5182,6 @@ class Core {
|
|
|
|
|
if (EntityFolder.DRAFTS.equals(folder.type))
|
|
|
|
|
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<>();
|
|
|
|
|
if (folder.isOutgoing()) {
|
|
|
|
|
if (message.from != null)
|
|
|
|
@ -5215,7 +5211,6 @@ class Core {
|
|
|
|
|
for (Address address : addresses)
|
|
|
|
|
for (EntityIdentity identity : identities)
|
|
|
|
|
if (identity.sameAddress(address)) {
|
|
|
|
|
if (log)
|
|
|
|
|
Log.i("Matched same" +
|
|
|
|
|
" identity=" + identity.email +
|
|
|
|
|
" address=" + ((InternetAddress) address).getAddress() +
|
|
|
|
@ -5226,7 +5221,6 @@ class Core {
|
|
|
|
|
for (Address address : addresses)
|
|
|
|
|
for (EntityIdentity identity : identities)
|
|
|
|
|
if (identity.similarAddress(address)) {
|
|
|
|
|
if (log)
|
|
|
|
|
Log.i("Matched similar" +
|
|
|
|
|
" identity=" + identity.email +
|
|
|
|
|
" regex=" + identity.sender_extra_regex +
|
|
|
|
@ -5238,7 +5232,6 @@ class Core {
|
|
|
|
|
if (deliveredto != null)
|
|
|
|
|
for (EntityIdentity identity : identities)
|
|
|
|
|
if (identity.sameAddress(deliveredto) || identity.similarAddress(deliveredto)) {
|
|
|
|
|
if (log)
|
|
|
|
|
Log.i("Matched deliveredto" +
|
|
|
|
|
" identity=" + identity.email +
|
|
|
|
|
" regex=" + identity.sender_extra_regex +
|
|
|
|
@ -5248,7 +5241,6 @@ class Core {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (log)
|
|
|
|
|
Log.i("Matched none" +
|
|
|
|
|
" addresses=" + MessageHelper.formatAddresses(addresses.toArray(new Address[0])) +
|
|
|
|
|
" deliveredto=" + (deliveredto == null ? null : ((InternetAddress) deliveredto).getAddress()) +
|
|
|
|
|