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

Allow checking headers conditions if headers were downloaded

This commit is contained in:
M66B 2021-05-20 21:52:37 +02:00
parent 03eacaada5
commit 82827d0faa
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ import org.json.JSONObject;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@ -62,6 +63,7 @@ import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.InternetHeaders;
import static androidx.room.ForeignKey.CASCADE;
@ -233,12 +235,19 @@ public class EntityRule {
// Header
JSONObject jheader = jcondition.optJSONObject("header");
if (jheader != null && imessage != null) {
if (jheader != null) {
String value = jheader.getString("value");
boolean regex = jheader.getBoolean("regex");
boolean matches = false;
Enumeration<Header> headers = imessage.getAllHeaders();
Enumeration<Header> headers;
if (imessage != null)
headers = imessage.getAllHeaders();
else if (message.headers != null) {
ByteArrayInputStream bis = new ByteArrayInputStream(message.headers.getBytes());
headers = new InternetHeaders(bis).getAllHeaders();
} else
throw new IllegalArgumentException(context.getString(R.string.title_rule_no_headers));
while (headers.hasMoreElements()) {
Header header = headers.nextElement();
String formatted = header.getName() + ": " + header.getValue();

7
app/src/main/java/eu/faircode/email/FragmentRule.java
View File

@ -1054,13 +1054,6 @@ public class FragmentRule extends FragmentBase {
JSONObject jcondition = getCondition();
JSONObject jaction = getAction();
JSONObject jheader = jcondition.optJSONObject("header");
if (jheader != null) {
Snackbar.make(view, R.string.title_rule_no_headers, Snackbar.LENGTH_LONG)
.setGestureInsetBottomIgnored(true).show();
return;
}
Bundle args = new Bundle();
args.putLong("folder", folder);
args.putString("condition", jcondition.toString());