Refactoring

2021-12-07 23:10:37 +01:00
parent 128116025f
commit b88801500f
17 changed files with 34 additions and 29 deletions
--- a/app/src/main/java/com/jens/automation2/location/LocationProvider.java
+++ b/app/src/main/java/com/jens/automation2/location/LocationProvider.java
@@ -201,7 +201,7 @@ public class LocationProvider
 									ArrayList<Rule> ruleCandidates = Rule.findRuleCandidatesBySpeed();
 									for (Rule oneRule : ruleCandidates)
 									{
-										if ((oneRule.applies(this.getParentService()) && oneRule.hasNotAppliedSinceLastExecution()) || oneRule.isActuallyToggable())
+										if(oneRule.getsGreenLight(this.getParentService()))
 											oneRule.activate(getParentService(), false);
 									}
 								}