From c688a4c460555b433e64c4c92318ea392fb1ed9c Mon Sep 17 00:00:00 2001 From: jens Date: Sat, 26 Mar 2022 20:00:50 +0100 Subject: [PATCH] TimeFrame repetition fix --- app/src/fdroidFlavor/java/com/jens/automation2/Rule.java | 9 +++++++++ .../googlePlayFlavor/java/com/jens/automation2/Rule.java | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/app/src/fdroidFlavor/java/com/jens/automation2/Rule.java b/app/src/fdroidFlavor/java/com/jens/automation2/Rule.java index b8102bdc..3e15a09d 100644 --- a/app/src/fdroidFlavor/java/com/jens/automation2/Rule.java +++ b/app/src/fdroidFlavor/java/com/jens/automation2/Rule.java @@ -331,6 +331,15 @@ public class Rule implements Comparable { if (oneTrigger.hasStateNotAppliedSinceLastRuleExecution()) return true; + + /* + Workaround for repetition in TimeFrame triggers + */ + if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.timeFrame)) + { + if(oneTrigger.getTimeFrame().repetition > 0) + return true; + } } return false; diff --git a/app/src/googlePlayFlavor/java/com/jens/automation2/Rule.java b/app/src/googlePlayFlavor/java/com/jens/automation2/Rule.java index 6ec99af3..5d8f255b 100644 --- a/app/src/googlePlayFlavor/java/com/jens/automation2/Rule.java +++ b/app/src/googlePlayFlavor/java/com/jens/automation2/Rule.java @@ -334,6 +334,15 @@ public class Rule implements Comparable { if (oneTrigger.hasStateNotAppliedSinceLastRuleExecution()) return true; + + /* + Workaround for repetition in TimeFrame triggers + */ + if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.timeFrame)) + { + if(oneTrigger.getTimeFrame().repetition > 0) + return true; + } } return false;