Changeset 278 for trunk/hiptop/pester/net/sabi/pester/Alarms.java

Timestamp:

07/23/06 08:33:15 (18 years ago)

Author:

Nicholas Riley

Message:

Display message on empty list (no longer need to add/remove border). Don't let alarms go off while you're deciding whether to discard them. First, untested attempt at handling hard resets (waiting on advice from Danger). Very ugly rewrite of alarm alert; needs much fixing.

File:

• trunk/hiptop/pester/net/sabi/pester/Alarms.java (modified) (8 diffs)

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

@@ -23 +23 @@
     private Alarms() {
         mDataStore = DataStore.createDataStore("alarms", true /* auto sync */);
+        // register us for Event.EVENT_DATASTORE_RESTORED, which only
+        // seems to be documented at:
+        // <http://developer.danger.com/forum/index.php?t=msg&th=27>
+        mDataStore.setAutoSyncNotifyee(sListener);
+        refreshFromDataStore(false);
+    }
+
+    void refreshFromDataStore(boolean datastoreRestored) {
+        sAlarmList = null;
+        removeAllItems();
+        if (datastoreRestored)
+            mDataStore.doneResolvingConflict(); // resolves UID conflicts
         byte[][] alarmsData = mDataStore.getRecords();
         int i;
@@ -32 +44 @@
             alarm.resume();
         }
+        sAlarmList = this;
     }
 
@@ -39 +52 @@
             sSettingsDB = new SettingsDB("settings", true /* auto sync */);
             sListener = new Listener();
-            sAlarmList = new Alarms();
+            new Alarms();
         }
         return sAlarmList;
@@ -51 +64 @@
     }
 
-    // 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
@@ -62 +70 @@
         DEBUG.p("adding: " + alarm +
                 " next UID: " + mDataStore.getAutoSyncNextUID());
-        index = mDataStore.addRecord(alarm.toByteArray(), index);
+        index = mDataStore.addRecord(alarm.toByteArray());
         alarm.setUID(mDataStore.getRecordUID(index));
         DEBUG.p("added UID " + alarm.getUID() + " @ " + index);
@@ -68 +76 @@
 
     protected void onItemRemoved(Object item, int index) {
+        if (sAlarmList == null) // restoring from service (after hard reset)
+            return;
         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);
     }
@@ -81 +89 @@
             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());
@@ -114 +121 @@
                 Alarms.getList().forEach(this);
                 return true;
+            } else if (e.type == Event.EVENT_DATASTORE_RESTORED) {
+                String dbName = (String)e.argument;
+                DEBUG.p("DATASTORE_RESTORED: " + dbName);
+                if (!dbName.endsWith("alarms")) {
+                    // because we only get/set the default alarm on demand
+                    // there's no need to handle conflicts with the settings...
+                    // XXX but what happens if we set a (default) alarm, then
+                    // the SettingsDB restores?
+                    Alarms.getList().refreshFromDataStore(true);
+                }
             }
             return super.receiveEvent(e);