From 5786c1bfd40ef55618c2f41c56c3fdcae381487d Mon Sep 17 00:00:00 2001 From: jens Date: Sat, 21 May 2022 02:33:56 +0200 Subject: [PATCH] full day time window --- .../java/com/jens/automation2/Trigger.java | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/jens/automation2/Trigger.java b/app/src/main/java/com/jens/automation2/Trigger.java index 598786bb..b75e7e33 100644 --- a/app/src/main/java/com/jens/automation2/Trigger.java +++ b/app/src/main/java/com/jens/automation2/Trigger.java @@ -884,20 +884,24 @@ public class Trigger if( // Regular case, start time is lower than end time ( - Miscellaneous.compareTimes(tf.getTriggerTimeStart(), nowTime) >= 0 - && - Miscellaneous.compareTimes(nowTime, tf.getTriggerTimeStop()) > 0 + Miscellaneous.compareTimes(tf.getTriggerTimeStart(), nowTime) >= 0 + && + Miscellaneous.compareTimes(nowTime, tf.getTriggerTimeStop()) > 0 + ) + || + // Other case, start time higher than end time, timeframe goes over midnight + ( + Miscellaneous.compareTimes(tf.getTriggerTimeStart(), tf.getTriggerTimeStop()) < 0 + && + (Miscellaneous.compareTimes(tf.getTriggerTimeStart(), nowTime) >= 0 + || + Miscellaneous.compareTimes(nowTime, tf.getTriggerTimeStop()) > 0) + ) + || + // further case: start and end times are identical, meaning a 24h window + ( + Miscellaneous.compareTimes(tf.getTriggerTimeStart(), tf.getTriggerTimeStop()) == 0 ) - | - // Other case, start time higher than end time, timeframe goes over midnight - ( - Miscellaneous.compareTimes(tf.getTriggerTimeStart(), tf.getTriggerTimeStop()) < 0 - && - (Miscellaneous.compareTimes(tf.getTriggerTimeStart(), nowTime) >= 0 - || - Miscellaneous.compareTimes(nowTime, tf.getTriggerTimeStop()) > 0) - ) - ) { // We are in the timeframe