Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-05-09 17:17:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added body parameter to URL rule

Browse Source
This commit is contained in:
M66B
2025-01-11 09:07:39 +01:00
parent c4da7ae14f
commit 44b0a3367a
3 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1514,6 +1514,7 @@ public class EntityRule {
private boolean onActionUrl(Context context, EntityMessage message, JSONObject jargs, String html) throws JSONException, IOException {
String url = jargs.getString("url");
String method = jargs.optString("method");
String body = (jargs.isNull("body") ? null : jargs.optString("body"));
if (TextUtils.isEmpty(method))
method = "GET";
@@ -1534,11 +1535,12 @@ public class EntityRule {
url = url.replace("$" + EXTRA_SUBJECT + "$", Uri.encode(message.subject == null ? "" : message.subject));
url = url.replace("$" + EXTRA_RECEIVED + "$", Uri.encode(DTF.format(message.received)));
String body = null;
if ("POST".equals(method) || "PUT".equals(method)) {
Uri u = Uri.parse(url);
body = u.getQuery();
url = u.buildUpon().clearQuery().build().toString();
if (!TextUtils.isEmpty(body)) {
body = body.replace("$" + EXTRA_RULE + "$", name == null ? "" : name);
body = body.replace("$" + EXTRA_SENDER + "$", address == null ? "" : address);
body = body.replace("$" + EXTRA_NAME + "$", personal == null ? "" : personal);
body = body.replace("$" + EXTRA_SUBJECT + "$", message.subject == null ? "" : message.subject);
body = body.replace("$" + EXTRA_RECEIVED + "$", DTF.format(message.received));
}
Log.i("GET " + url);