From 6f1f112d9881d0b6b4e3d4d45f0c4ecfcffbd13c Mon Sep 17 00:00:00 2001 From: Jens Date: Fri, 27 Feb 2026 22:46:31 +0100 Subject: [PATCH] Further actions for trigger url action --- .../main/java/com/jens/automation2/Action.java | 17 ++++++++++++++--- .../com/jens/automation2/Miscellaneous.java | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/jens/automation2/Action.java b/app/src/main/java/com/jens/automation2/Action.java index 433e50f..94490c9 100644 --- a/app/src/main/java/com/jens/automation2/Action.java +++ b/app/src/main/java/com/jens/automation2/Action.java @@ -730,7 +730,7 @@ public class Action if(parameters.length >= 3) { urlUsername = parameters[1]; - urlPassword = parameters[2]; + urlPassword = parameters[2]; if(parameters.length >= 4) method = parameters[3]; @@ -739,11 +739,22 @@ public class Action { // has params String[] paramPairs = parameters[4].split(Action.actionParameters2SeparatorOuter); + String value = ""; for(String pair : paramPairs) { String[] pieces = pair.split(Action.actionParameters2SeparatorInner); - if(pieces.length == 2) - httpParams.put(pieces[0], pieces[1]); + + try + { + value = Miscellaneous.replaceVariablesInText(pieces[1], Miscellaneous.getAnyContext()); + } + catch (Exception e) + { + value = "error"; + } + + if(pieces.length == 2) + httpParams.put(pieces[0], value); } } } diff --git a/app/src/main/java/com/jens/automation2/Miscellaneous.java b/app/src/main/java/com/jens/automation2/Miscellaneous.java index 2f3ddc1..159d067 100644 --- a/app/src/main/java/com/jens/automation2/Miscellaneous.java +++ b/app/src/main/java/com/jens/automation2/Miscellaneous.java @@ -310,7 +310,7 @@ public class Miscellaneous extends Service } catch(Exception e) { - Miscellaneous.logEvent("e", "HTTP error", Log.getStackTraceString(e), 3); + Miscellaneous.logEvent("e", "HTTP error", Log.getStackTraceString(e), 3); return http_error_string; } // finally