caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

pass last execution time to triggers

Browse source
This commit is contained in:
Milos Kozak 2019-04-16 23:52:30 +02:00
parent 4ae7efc75f
commit a828bcba53
6 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.java
View file

@ -201,6 +201,7 @@ public class AutomationPlugin extends PluginBase {
}
});
}
event.getTrigger().executed(DateUtil.now());
}
}

4
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.java
View file

@ -89,6 +89,7 @@ public abstract class Trigger {
public abstract boolean shouldRun();
public abstract String toJSON();
/*package*/ abstract Trigger fromJSON(String data);
@ -99,8 +100,7 @@ public abstract class Trigger {
public abstract Optional<Integer> icon();
void notifyAboutRun(long time) {
}
public abstract void executed(long time);
public abstract Trigger duplicate();

4
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java
View file

@ -131,6 +131,10 @@ public class TriggerBg extends Trigger {
return Optional.of(R.drawable.icon_cp_bgcheck);
}
@Override
public void executed(long time) {
}
@Override
public Trigger duplicate() {
return new TriggerBg(this);

7
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.java
View file

@ -192,6 +192,13 @@ public class TriggerConnector extends Trigger {
return Optional.absent();
}
@Override
public void executed(long time) {
for (int i = 0; i < list.size(); ++i) {
list.get(i).executed(time);
}
}
@Override
public Trigger duplicate() {
return null;

2
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.java
View file

@ -214,7 +214,7 @@ public class TriggerRecurringTime extends Trigger {
}
@Override
void notifyAboutRun(long time) {
public void executed(long time) {
lastRun = time;
}

4
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.java
View file

@ -90,7 +90,7 @@ public class TriggerTime extends Trigger {
}
@Override
void notifyAboutRun(long time) {
public void executed(long time) {
lastRun = time;
}
@ -104,7 +104,7 @@ public class TriggerTime extends Trigger {
return new TriggerTime(this);
}
public long getRunAt() {
long getRunAt() {
return runAt;
}