Changeset 276 for trunk

Timestamp:

07/22/06 08:45:34 (18 years ago)

Author:

Nicholas Riley

Message:

First pass at alarm persistence.

Location:

trunk/hiptop/pester/net/sabi/pester

Files:

• Alarm.java (modified) (3 diffs)
• AlarmListView.java (modified) (2 diffs)
• Alarms.java (modified) (5 diffs)

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

@@ -32 +32 @@
     private int mAbsoluteFireTime; // only valid if periodic
     private danger.app.Alarm mAlarm;
+    private int mUID;
 
     public Alarm() {
         mState = STATE_INVALID;
         mAlarm = new danger.app.Alarm(0, Application.getCurrentApp(), this);
+        mUID = 0;
     }
 
@@ -55 +57 @@
     public RingToneObject getAlert() {
         return mAlert;
+    }
+    public int getUID() {
+        return mUID;
     }
 
@@ -70 +75 @@
     public void setAlert(RingToneObject alert) {
         mAlert = alert.isValid() ? alert : null;
+    }
+    public void setUID(int uid) {
+        mUID = uid;
     }
 

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

@@ -22 +22 @@
     public void onDecoded() {
         sAlarmListWindow = (AlarmListWindow)getWindow();
+        mToolTipAlarm = new danger.app.Alarm(0, this);
         setAutoResize(true);
-        setHasBorder(false); // this doesn't work in the rsrc file
         setList(Alarms.getList());
-        if (alarmsSet() > 0)
-            setHasBorder(true);
-        mToolTipAlarm = new danger.app.Alarm(0, this);
+        if (alarmsSet() == 0)
+            setHasBorder(false); // this doesn't work in the rsrc file
         Application.registerForEvent(this, Event.EVENT_TIME_CHANGED);
         super.onDecoded();
@@ -65 +64 @@
             Alarms.removeAlarm((Alarm)getFocusedItem());
             return true;
-        case Event.EVENT_TIME_CHANGED:
+        case Event.EVENT_TIME_CHANGED: // XXX EVENT_TIME_FORMAT_CHANGED too
             if (mToolTipWindow == null || !mToolTipWindow.isVisible())
                 return true;

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

@@ -9 +9 @@
 import danger.internal.Date;
 import danger.util.StdActiveList;
+import danger.util.DEBUG;
 
 public class Alarms extends StdActiveList {
@@ -22 +23 @@
     private Alarms() {
         mDataStore = DataStore.createDataStore("alarms", true /* auto sync */);
+        byte[][] alarmsData = mDataStore.getRecords();
+        int i;
+        for (i = 0 ; i < alarmsData.length ; ++i) {
+            Alarm alarm = new Alarm();
+            alarm.fromByteArray(alarmsData[i]);
+            alarm.setUID(mDataStore.getRecordUID(i));
+            insertItemSorted(alarm, alarm);
+            alarm.resume();
+        }
     }
 
     public static Alarms getList() {
         if (sAlarmList == null) {
+            Application.registerForEvent(sListener, Event.EVENT_TIME_CHANGED);
+            sSettingsDB = new SettingsDB("settings", true /* auto sync */);
+            sListener = new Listener();
             sAlarmList = new Alarms();
-            sListener = new Listener();
-            sSettingsDB = new SettingsDB("settings", true /* auto sync */);
-            Application.registerForEvent(sListener, Event.EVENT_TIME_CHANGED);
         }
         return sAlarmList;
@@ -39 +49 @@
     public static void removeAlarm(Alarm alarm) {
         sAlarmList.removeItem(alarm);
+    }
+
+    // XXX handle EVENT_DATASTORE_RESTORED: note that in the event of
+    // a hard reset, items may come back out of order, so we need to
+    // implement an in-place sort, then insert the current alarm list.
+    // Aiee.  Also, what on earth happens when UIDs aren't synchronized?
+    
+    protected void onItemAdded(Object item, int index) {
+        if (sAlarmList == null) // restoring from service
+            return;
+        Alarm alarm = (Alarm)item;
+        DEBUG.p("adding: " + alarm +
+                " next UID: " + mDataStore.getAutoSyncNextUID());
+        index = mDataStore.addRecord(alarm.toByteArray(), index);
+        alarm.setUID(mDataStore.getRecordUID(index));
+        DEBUG.p("added UID " + alarm.getUID() + " @ " + index);
+    }
+
+    protected void onItemRemoved(Object item, int index) {
+        Alarm alarm = (Alarm)item;
+        // XXX make sure +/- UIDs are OK
+        int uid = alarm.getUID();
+        if (uid == 0)
+            return;
+        DEBUG.p("removing; " + alarm + " UID " + uid);
+        mDataStore.removeRecordByUID(uid);
+    }
+
+    public void onItemUpdated(Object item, int index) {
+        if (sAlarmList == null) // restoring from service
+            return;
+        Alarm alarm = (Alarm)item;
+        // XXX check that updating a + UID by a - one is OK
+        mDataStore.setRecordDataByUID(alarm.getUID(), alarm.toByteArray(), true);
+        DEBUG.p("updated: " + alarm + " UID " + alarm.getUID());
     }
 
@@ -67 +112 @@
         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;
@@ -75 +119 @@
     }
 }
-