Changeset 295 for trunk/hiptop/pester/net/sabi/pester/Alarm.java

Timestamp:

07/28/06 08:33:38 (18 years ago)

Author:

Nicholas Riley

Message:

Move discard alert text to resource. Fix listener for
EVENT_TIME_CHANGED I broke a few days ago. Only use
Alarm.mAbsoluteFireTime to measure real time if the alarm was
scheduled/rescheduled (through user action, not restoration from a
datastore) since boot. Don't display dates in the past as if they're
in the following week.

File:

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

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

@@ -31 +31 @@
     // transient
     private int mState;
-    private int mAbsoluteFireTime; // only valid if periodic
+    private int mAbsoluteFireTime; // valid if periodic and modified since reboot
     private danger.app.Alarm mAlarm;
     private int mUID;
@@ -39 +39 @@
         mAlarm = new danger.app.Alarm(0, Application.getCurrentApp(), this);
         mUID = 0;
+        mAbsoluteFireTime = -1;
     }
 
@@ -83 +84 @@
         mDate = new Date();
         mDate.addMinutes(minutes);
+        mAbsoluteFireTime = Hardware.getAbsoluteTime() + (minutes * 60);
         resume();
     }
@@ -121 +123 @@
             int alertID = dataStream.readInt();
             mAlert = (alertID == 0 ? null : new RingToneObject(alertID));
+            mAbsoluteFireTime = -1; // just in case
         } catch (Exception e) {
             // XXX do something
@@ -152 +155 @@
         if (mState != STATE_SCHEDULED)
             return;
-        if (getUsesPeriod()) {
+        if (getUsesPeriod() && mAbsoluteFireTime != -1) {
             int realSecondsLeft = mAbsoluteFireTime - Hardware.getAbsoluteTime();
             mDate = new Date();
@@ -230 +233 @@
             else if (daysFromToday == 1)
                 dateString = "Tomorrow"; // XXX localize
-            else if (daysFromToday < 7)
+            else if (daysFromToday > 1 && daysFromToday < 7)
                 dateString = date.getDayString();
             else