Changeset 297

Timestamp:

07/29/06 06:32:09 (18 years ago)

Author:

Nicholas Riley

Message:

Store deleted alarms creation IDs (timestamps) in on-device datastore, delete/omit on sync from service.

Location:

trunk/hiptop/pester/net/sabi/pester

Files:

• Alarm.java (modified) (5 diffs)
• Alarms.java (modified) (8 diffs)

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

@@ -28 +28 @@
     private Date mDate;
     private RingToneObject mAlert;
+    private int mCreationID;
 
     // transient
@@ -39 +40 @@
         mState = STATE_INVALID;
         mAlarm = new danger.app.Alarm(0, Application.getCurrentApp(), this);
+        mCreationID = Hardware.getSystemTime();
         mUID = 0;
         mAbsoluteFireTime = -1;
@@ -63 +65 @@
     public int getUID() {
         return mUID;
+    }
+    public int getCreationID() {
+        return mCreationID;
     }
 
@@ -100 +105 @@
             dataStream.writeInt(mType);
             dataStream.writeInt(mAlert == null ? 0 : mAlert.getID());
+            dataStream.writeInt(mCreationID);
             dataStream.flush();
             return byteStream.toByteArray();
         } catch (Exception e) {
             // XXX do something
-            DEBUG.p("failed to write alarm:" + e);
+            DEBUG.p("failed to write alarm: " + e);
         }
         return null;
@@ -124 +130 @@
             int alertID = dataStream.readInt();
             mAlert = (alertID == 0 ? null : new RingToneObject(alertID));
+            mCreationID = dataStream.readInt();
             mAbsoluteFireTime = -1; // just in case
         } catch (Exception e) {
-            // XXX do something
-            DEBUG.p("failed to read alarm:" + e);
+            // XXX do something, prevernt alarm from being activated
+            DEBUG.p("failed to read alarm: " + e);
         }
     }

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

@@ -1 +1 @@
 package net.sabi.pester;
 
+import java.util.Arrays;
 import java.util.Comparator;
 import danger.app.Application;
@@ -8 +9 @@
 import danger.app.SettingsDBException;
 import danger.internal.Date;
+import danger.util.ByteArray;
 import danger.util.StdActiveList;
 import danger.util.DEBUG;
@@ -18 +20 @@
     private static Listener sListener;
     private static SettingsDB sSettingsDB;
+    private static DataStore sDeletedAlarms;
 
     private DataStore mDataStore;
@@ -28 +31 @@
         mDataStore.setAutoSyncNotifyee(sListener);
         refreshFromDataStore(false);
+    }
+
+    private int[] deletedAlarmsCreationIDs() {
+        byte[][] deletedAlarmsData = sDeletedAlarms.getRecords();
+        int[] ids = new int[deletedAlarmsData.length];
+        for (int i = 0 ; i < deletedAlarmsData.length ; ++i)
+            ids[i] = ByteArray.readInt(deletedAlarmsData[i], 0);
+        Arrays.sort(ids);
+        return ids;
     }
 
@@ -51 +63 @@
     void refreshFromDataStore(boolean datastoreRestored) {
         sAlarmList = null;
+        int[] deleted = null;
         if (datastoreRestored) {
+            deleted = deletedAlarmsCreationIDs();
             DEBUG.p("+++ BEFORE RESOLUTION +++");
             dumpAlarms();
@@ -69 +83 @@
             alarm.fromByteArray(alarmsData[i]);
             alarm.setUID(mDataStore.getRecordUID(i));
+            if (Arrays.binarySearch(deleted, alarm.getCreationID()) >= 0) {
+                mDataStore.removeRecord(i);
+                continue;
+            }
             insertItemSorted(alarm, alarm);
             alarm.resume();
@@ -86 +104 @@
         if (sAlarmList == null) {
             sSettingsDB = new SettingsDB("settings", true /* auto sync */);
+            sDeletedAlarms = DataStore.createDataStore("deleted alarms");
             sListener = new Listener();
             new Alarms();
@@ -126 +145 @@
         if (uid < 0)
             mDataStore.removeRecordByUID(-uid);
+        while (sDeletedAlarms.getRecordCount() >= MAX_ALARM_COUNT)
+            sDeletedAlarms.removeRecord(0);
+        byte[] idBytes = new byte[4];
+        ByteArray.writeInt(idBytes, 0, alarm.getCreationID());
+        sDeletedAlarms.addRecord(idBytes);
         DEBUG.p("DEL" + alarm.description());
     }