bagnacauda/Automation
1
0
Fork 0
forked from jens/Automation
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development-stable' into development

Browse Source 
# Conflicts:
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-it/strings.xml
#	app/src/main/res/values-nl/strings.xml
#	app/src/main/res/values/strings.xml
#	build.gradle
#	fastlane/metadata/android/en-US/changelogs/119.txt
This commit is contained in:
jens
2022-05-15 01:54:32 +02:00
parent 965bf55811 7046cccabe
commit 41efa7c11b
36 changed files with 283 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/jens/automation2/Trigger.java
View File

@@ -935,7 +935,7 @@ public class Trigger
Miscellaneous.compareTimes(tf.getTriggerTimeStart(), tf.getTriggerTimeStop()) < 0
&&
(Miscellaneous.compareTimes(tf.getTriggerTimeStart(), nowTime) >= 0
|
||
Miscellaneous.compareTimes(nowTime, tf.getTriggerTimeStop()) > 0)
)