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

TimeFrame repetition fix

Browse Source
This commit is contained in:
jens 2022-03-26 20:00:19 +01:00
parent 0368b2a8c8
commit 5a09962cc9
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/apkFlavor/java/com/jens/automation2/Rule.java
View File

@ -334,6 +334,15 @@ public class Rule implements Comparable<Rule>
{ {
if (oneTrigger.hasStateNotAppliedSinceLastRuleExecution()) if (oneTrigger.hasStateNotAppliedSinceLastRuleExecution())
return true; 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; return false;

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

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

1
app/src/main/java/com/jens/automation2/receivers/DateTimeListener.java
View File

@ -266,7 +266,6 @@ public class DateTimeListener extends BroadcastReceiver implements AutomationLis
Intent alarmIntent = new Intent(automationServiceRef, DateTimeListener.class); Intent alarmIntent = new Intent(automationServiceRef, DateTimeListener.class);
PendingIntent alarmPendingIntent = PendingIntent.getBroadcast(automationServiceRef, 0, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent alarmPendingIntent = PendingIntent.getBroadcast(automationServiceRef, 0, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
centralAlarmManagerInstance.set(AlarmManager.RTC_WAKEUP, scheduleCandidate.time.getTimeInMillis(), alarmPendingIntent); centralAlarmManagerInstance.set(AlarmManager.RTC_WAKEUP, scheduleCandidate.time.getTimeInMillis(), alarmPendingIntent);
SimpleDateFormat sdf = new SimpleDateFormat("E dd.MM.yyyy HH:mm"); SimpleDateFormat sdf = new SimpleDateFormat("E dd.MM.yyyy HH:mm");
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();

2
build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.1.1' classpath 'com.android.tools.build:gradle:7.1.2'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files