Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-14 21:13:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rule move: added $email$ placeholder

Browse Source
This commit is contained in:
M66B
2022-09-16 14:16:03 +02:00
parent 4bc02cee83
commit 6ce9222300
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/EntityRule.java
View File

@@ -627,16 +627,22 @@ public class EntityRule {
create = create.replace("$year$", year);
create = create.replace("$month$", month);
String domain = "";
String email = null;
String domain = null;
if (message.from != null &&
message.from.length > 0 &&
message.from[0] instanceof InternetAddress) {
InternetAddress from = (InternetAddress) message.from[0];
domain = UriHelper.getEmailDomain(from.getAddress());
email = from.getAddress();
domain = UriHelper.getEmailDomain(email);
}
create = create.replace("$domain$", domain);
create = create.replace("$email$", email == null ? "" : email);
create = create.replace("$domain$", domain == null ? "" : domain);
String name = folder.name + folder.separator + create;
if (folder.separator != null)
create = create.replace(folder.separator, '_');
String name = folder.name + (folder.separator == null ? "" : folder.separator) + create;
EntityFolder created = db.folder().getFolderByName(message.account, name);
if (created == null) {
created = new EntityFolder();