Changeset 255 for trunk

Timestamp:

07/19/06 04:38:21 (18 years ago)

Author:

Nicholas Riley

Message:

Handle time changes by rescheduling (if it's time-based) or just updating the fire time (if it's interval-based, since those use real time when active).

Location:

trunk/hiptop/pester/net/sabi/pester

Files:

• Alarm.java (modified) (4 diffs)
• AlarmSetDialog.java (modified) (1 diff)
• Alarms.java (modified) (3 diffs)

trunk/hiptop/pester/net/sabi/pester/Alarm.java

@@ -8 +8 @@
 import danger.audio.RingToneObject;
 import danger.internal.Date;
+import danger.system.Hardware;
 import danger.util.LocaleUtils;
 import danger.util.StdActiveList;
@@ -27 +28 @@
     // transient
     private int mState;
+    private int mAbsoluteFireTime; // only valid if periodic
     private danger.app.Alarm mAlarm;
 
@@ -122 +124 @@
     }
 
-    // XXX trigger on EVENT_TIME_CHANGED
     void resume() {
         mState = STATE_SCHEDULED;
@@ -132 +133 @@
     }
 
+    void timeChanged() {
+        if (mState != STATE_SCHEDULED)
+            return;
+        if (getUsesPeriod()) {
+            int realSecondsLeft = mAbsoluteFireTime - Hardware.getAbsoluteTime();
+            mDate = new Date();
+            mDate.addSeconds(realSecondsLeft < 0 ? 0 : realSecondsLeft);
+            // no need to call resume(): alarm uses absolute time
+        } else {
+            resume();
+        }
+    }
+
     void schedule() {
         if (getUsesPeriod()) {
             mDate = new Date();
             mDate.addSeconds(mPeriod);
+            mAbsoluteFireTime = Hardware.getAbsoluteTime() + mPeriod;
         }
         resume();

trunk/hiptop/pester/net/sabi/pester/AlarmSetDialog.java

@@ -127 +127 @@
         }
         validate();
-        Application.registerForEvent(this, Event.EVENT_TIME_CHANGED));
+        Application.registerForEvent(this, Event.EVENT_TIME_CHANGED);
         show();
         if (!mHaveShownWindow) {

trunk/hiptop/pester/net/sabi/pester/Alarms.java

@@ -2 +2 @@
 
 import java.util.Comparator;
+import danger.app.Application;
 import danger.app.DataStore;
+import danger.app.Event;
 import danger.util.StdActiveList;
 
@@ -10 +12 @@
 
     private static Alarms sAlarmList = null;
-    private static DataStore sDataStore;
+    private static Listener sListener;
+
+    private DataStore mDataStore;
 
     private Alarms() {
-        sDataStore = DataStore.createDataStore("alarms", true /* auto sync */);
+        mDataStore = DataStore.createDataStore("alarms", true /* auto sync */);
     }
 
     public static Alarms getList() {
-        if (sAlarmList == null)
+        if (sAlarmList == null) {
             sAlarmList = new Alarms();
+            sListener = new Listener();
+            Application.registerForEvent(sListener, Event.EVENT_TIME_CHANGED);
+        }
         return sAlarmList;
     }
@@ -37 +44 @@
     }
     */
+
+    static class Listener extends danger.app.Listener
+        implements danger.util.ActiveList.ForEach {
+        
+        public void receive(Object item) {
+            ((Alarm)item).timeChanged();
+        }
+
+        public boolean receiveEvent(Event e) {
+            if (e.type == Event.EVENT_TIME_CHANGED) {
+                // XXX do we get this when the time zone changes?
+                Alarms.getList().forEach(this);
+                return true;
+            }
+            return super.receiveEvent(e);
+        }
+    }
 }
+