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

Timestamp:

07/29/06 00:53:01 (18 years ago)

Author:

Nicholas Riley

Message:

Better alarm debug description, datastore debugging; use absolute fire time for snoozed alarms too; replace the buggy alarm stack and misaligned sleep message with a painfully constructed alert.

File:

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

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

@@ -30 +30 @@
     }
 
+    private void dumpAlarms() { // XXX enable via IPC, make validity checking
+        int i;
+        DEBUG.p("== ALARMS ==");
+        for (i = 0 ; i < size() ; ++i) {
+            DEBUG.p(((Alarm)getItem(i)).description());
+        }
+
+    }
+    private void dumpDatastore() {
+        int i;
+        DEBUG.p("== DATASTORE CONTENTS ==");
+        byte[][] alarmsData = mDataStore.getRecords();
+        for (i = 0 ; i < alarmsData.length ; ++i) {
+            Alarm alarm = new Alarm();
+            alarm.fromByteArray(alarmsData[i]);
+            alarm.setUID(mDataStore.getRecordUID(i));
+            DEBUG.p(alarm.description());
+        }
+    }
     void refreshFromDataStore(boolean datastoreRestored) {
         sAlarmList = null;
-        removeAllItems();
+        if (datastoreRestored) {
+            DEBUG.p("+++ BEFORE RESOLUTION +++");
+            dumpAlarms();
+            dumpDatastore();
+        }
+        removeAllItems(); // XXX no, we can't do this because some alarms may be (a) in the process of being edited, (b) sitting at expiry, or (c) are periodic or snoozed and need their absolute time preserved.  Instead, we should just add all the new records - but what about conflicts?
         if (datastoreRestored)
-            mDataStore.doneResolvingConflict(); // resolves UID conflicts
+            mDataStore.doneResolvingConflict(); // renumbers on-device records
+        if (datastoreRestored) {
+            DEBUG.p("+++ AFTER RESOLUTION +++");
+            dumpDatastore();
+        }
         byte[][] alarmsData = mDataStore.getRecords();
         int i;
@@ -49 +77 @@
             MessageFinder.setDefaultMessageList();
         }
+        DEBUG.p("+++ AFTER RESTORATION +++");
+        dumpAlarms();
+        dumpDatastore();
         sAlarmList = this;
     }
@@ -80 +111 @@
             return;
         Alarm alarm = (Alarm)item;
-        DEBUG.p("adding: " + alarm +
-                " next UID: " + mDataStore.getAutoSyncNextUID());
         index = mDataStore.addRecord(alarm.toByteArray());
         alarm.setUID(mDataStore.getRecordUID(index));
-        DEBUG.p("added UID " + alarm.getUID() + " @ " + index);
+        DEBUG.p("ADD" + alarm.description());
     }
 
@@ -95 +124 @@
             return;
         mDataStore.removeRecordByUID(uid);
-        DEBUG.p("removed UID " + alarm.getUID());
+        if (uid < 0)
+            mDataStore.removeRecordByUID(-uid);
+        DEBUG.p("DEL" + alarm.description());
     }
 
@@ -103 +134 @@
         Alarm alarm = (Alarm)item;
         mDataStore.setRecordDataByUID(alarm.getUID(), alarm.toByteArray(), true);
-        DEBUG.p("updated: " + alarm + " UID " + alarm.getUID());
+        DEBUG.p("MOD" + alarm.description());
     }
 
@@ -137 +168 @@
             } else if (e.type == Event.EVENT_DATASTORE_RESTORED) {
                 String dbName = (String)e.argument;
-                DEBUG.p("DATASTORE_RESTORED: " + dbName);
-                if (!dbName.endsWith("alarms")) {
+                DEBUG.p("Pester: 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...