Changeset 105 for trunk/Cocoa/Pester/Source/PSAlarm.m

Timestamp:

03/02/03 19:53:27 (21 years ago)

Author:

Nicholas Riley

Message:

PSAlarm.m: Fixed logic bug with invalid date/time combination. Added
repeating indicator to -description. Fixed plist archiving to
properly handle repeating alarms which expire while the app is quit
(1).

PSAlarmAlertController.m: Restore some debugging.

PSPowerManager.m: Properly return pmuReference (fixes compiler
warning, and 2).

Read Me.rtfd: Fixed some wording.

File:

• trunk/Cocoa/Pester/Source/PSAlarm.m (modified) (6 diffs)

trunk/Cocoa/Pester/Source/PSAlarm.m

@@ -184 +184 @@
     dateTime = [NSCalendarDate dateWithDate: date atTime: time];
     if (dateTime == nil) {
-        [self _beInvalid: @"Please specify a reasonable date and time."];
+        [self _beInvalid: @"Please specify a reasonable date and time."]; return;
     }
     [self setForDateAtTime: dateTime];
@@ -418 +418 @@
 - (NSString *)description;
 {
-    return [NSString stringWithFormat: @"%@: type %@ date %@ interval %.1f%@",
+    return [NSString stringWithFormat: @"%@: type %@ date %@ interval %.1f%@%@",
         [super description], [self _alarmTypeString], alarmDate, alarmInterval,
+        (repeating ? @" repeating" : @""),
         (alarmType == PSAlarmInvalid ?
          [NSString stringWithFormat: @"\ninvalid message: %@", invalidMessage]
@@ -437 +438 @@
         case PSAlarmSet:
             [dict setObject: [NSNumber numberWithDouble: [alarmDate timeIntervalSinceReferenceDate]] forKey: PLAlarmDate];
-            break;
         case PSAlarmSnooze:
         case PSAlarmInterval:
         case PSAlarmExpired:
-            [dict setObject: [NSNumber numberWithDouble: alarmInterval] forKey: PLAlarmInterval];
-            [dict setObject: [NSNumber numberWithBool: repeating] forKey: PLAlarmRepeating];
             break;
         default:
             NSAssert1(NO, NSLocalizedString(@"Can't save alarm type %@", "Assertion for invalid PSAlarm type on string; %@ replaced with alarm type string"), [self _alarmTypeString]);
             break;
+    }
+    if ((alarmType != PSAlarmSet || repeating) && alarmType != PSAlarmDate) {
+        [dict setObject: [NSNumber numberWithBool: repeating] forKey: PLAlarmRepeating];
+        [dict setObject: [NSNumber numberWithDouble: alarmInterval] forKey: PLAlarmInterval];
     }
     if (snoozeInterval != 0)
@@ -474 +476 @@
             case PSAlarmInterval:
             case PSAlarmExpired:
-                alarmInterval = [[dict objectForRequiredKey: PLAlarmInterval] doubleValue];
-                repeating = [[dict objectForRequiredKey: PLAlarmRepeating] boolValue];
                 break;
             default:
@@ -481 +481 @@
                 break;
         }
+        repeating = [[dict objectForKey: PLAlarmRepeating] boolValue];
+        if ((alarmType != PSAlarmSet || repeating) && alarmType != PSAlarmDate)
+            alarmInterval = [[dict objectForRequiredKey: PLAlarmInterval] doubleValue];
         snoozeInterval = [[dict objectForKey: PLAlarmSnoozeInterval] doubleValue];
         [self setMessage: [dict objectForRequiredKey: PLAlarmMessage]];
@@ -488 +491 @@
         if (alarmType == PSAlarmSet) {
             alarmType = PSAlarmDate;
-            [self setTimer];
+            // don't want to put this logic in setTimer or isValid because it can cause invalid alarms to be set (consider when someone clicks the "repeat" checkbox, then switches to a [nonrepeating, by design] date alarm, and enters a date that has passed: we do -not- want the alarm to magically morph into a repeating interval alarm)
+            if (![self setTimer] && [self isRepeating]) {
+                alarmType = PSAlarmInterval;
+                [self setInterval: [[dict objectForRequiredKey: PLAlarmInterval] doubleValue]];
+                [self setTimer];
+            }
         }
         if (alarmType == PSAlarmExpired) {