Author: echatellier Date: 2012-02-10 18:27:42 +0100 (Fri, 10 Feb 2012) New Revision: 2797 Url: http://chorem.org/repositories/revision/jtimer/2797 Log: Fix day change during idle detection Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-02-10 17:27:06 UTC (rev 2796) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-02-10 17:27:42 UTC (rev 2797) @@ -248,8 +248,6 @@ // reset on start just for init resetTiming(); - // redeclare taskTimingBeforeStartInSeconds - //taskTimingBeforeStartInMs = managedTask.getTime(new Date()) * 1000; // get idle time long configIdleTime = JTimerFactory.getIdleTime(); @@ -286,24 +284,23 @@ // if long idleTime is unavailable, if is always false if (idleTime >= JTimerFactory.getIdleTime()) { - // TODO check reset, but is hard when idle is detected - // idle detected // update time without idle time offsetTimeInMs -= configIdleTime; publish(taskTimingBeforeStartInMs + loopTimestamp - taskStartCalendar.getTimeInMillis() + offsetTimeInMs); - // parent application - JTimer parentApplication = (JTimer)getApplication(); - // send idle detect event + JTimer parentApplication = (JTimer)getApplication(); parentApplication.preIdleDetect(); - // ask user what to do + // ask user what to do (long blocking call) int option = IdleDialog.showIdleDialog(loopTimestamp - idleTime); // send idle detect event parentApplication.postIdleDetect(); - // get time after user + // day can have changed during idle + checkReset(); + + // get time after user idle long currentTime = Calendar.getInstance().getTimeInMillis(); lastPublishTimestamp = currentTime; @@ -335,7 +332,6 @@ } } else { - // pas de idle, met a jour le temps publish(taskTimingBeforeStartInMs + loopTimestamp - taskStartCalendar.getTimeInMillis() + offsetTimeInMs);