Give alarms and timers optional names.

Signed-off-by: Katharine Berry <ktbry@google.com>

Author: Katharine

app/package.json

@@ -74,7 +74,9 @@
       "REMINDER_ID",
       "REMINDER_TIME",
       "REMINDER_DELETE",
-      "ACTION_REMINDER_DELETED"
+      "ACTION_REMINDER_DELETED",
+      "SET_ALARM_NAME",
+      "GET_ALARM_NAME[9]"
     ],
     "resources": {
       "media": [

app/src/c/alarms/alarm_window.c

@@ -27,6 +27,7 @@
 typedef struct {
   time_t time;
   bool is_timer;
+  char *name;
   TextLayer *title_layer;
   TextLayer *time_layer;
   StatusBarLayer *status_bar;
@@ -52,12 +53,18 @@ static void prv_click_config_provider(void *context);
 static void prv_handle_snooze(ClickRecognizerRef recognizer, void *context);
 static void prv_handle_dismiss(ClickRecognizerRef recognizer, void *context);
 
-void alarm_window_push(time_t alarm_time, bool is_timer) {
+void alarm_window_push(time_t alarm_time, bool is_timer, char *name) {
   Window* window = window_create();
   AlarmWindowData *data = malloc(sizeof(AlarmWindowData));
   data->time = alarm_time;
   data->is_timer = is_timer;
   data->timer = NULL;
+  data->name = NULL;
+  if (name) {
+    size_t len = strlen(name);
+    data->name = malloc(len + 1);
+    strncpy(data->name, name, len + 1);
+  }
   window_set_user_data(window, data);
   window_set_window_handlers(window, (WindowHandlers) {
       .load = prv_window_load,
@@ -72,13 +79,19 @@ static void prv_window_load(Window *window) {
   AlarmWindowData* data = window_get_user_data(window);
   Layer* root_layer = window_get_root_layer(window);
   GRect rect = layer_get_bounds(root_layer);
-  data->title_layer = text_layer_create(GRect(0, STATUS_BAR_LAYER_HEIGHT, rect.size.w - ACTION_BAR_WIDTH, 35));
-  text_layer_set_text(data->title_layer, data->is_timer ? "Time's up!" : "Alarm!");
+  data->title_layer = text_layer_create(GRect(0, STATUS_BAR_LAYER_HEIGHT, rect.size.w - ACTION_BAR_WIDTH, 70));
+  if (data->name) {
+    text_layer_set_text(data->title_layer, data->name);
+  } else {
+    text_layer_set_text(data->title_layer, data->is_timer ? "Time's up!" : "Alarm!");
+  }
   text_layer_set_font(data->title_layer, fonts_get_system_font(FONT_KEY_GOTHIC_28_BOLD));
   text_layer_set_text_alignment(data->title_layer, GTextAlignmentCenter);
   text_layer_set_background_color(data->title_layer, GColorClear);
   layer_add_child(root_layer, (Layer *)data->title_layer);
-  data->time_layer = text_layer_create(GRect(0, STATUS_BAR_LAYER_HEIGHT + 35 + 15, rect.size.w - ACTION_BAR_WIDTH, 45));
+  GSize title_size = text_layer_get_content_size(data->title_layer);
+  int16_t remaining_height = rect.size.h - STATUS_BAR_LAYER_HEIGHT - title_size.h - 49;
+  data->time_layer = text_layer_create(GRect(0, STATUS_BAR_LAYER_HEIGHT + title_size.h + remaining_height / 2 - 22 / 2, rect.size.w - ACTION_BAR_WIDTH, 32));
   text_layer_set_font(data->time_layer, fonts_get_system_font(FONT_KEY_LECO_32_BOLD_NUMBERS));
   text_layer_set_text_alignment(data->time_layer, GTextAlignmentCenter);
   text_layer_set_background_color(data->time_layer, GColorClear);
@@ -122,6 +135,9 @@ static void prv_window_unload(Window *window) {
   gdraw_command_sequence_destroy(data->draw_commands);
   vector_sequence_layer_destroy(data->animation_layer);
   events_tick_timer_service_unsubscribe(data->tick_handle);
+  if (data->name) {
+    free(data->name);
+  }
   free(data);
   window_destroy(window);
 }
@@ -206,9 +222,9 @@ static void prv_handle_snooze(ClickRecognizerRef recognizer, void *context) {
   AlarmWindowData* data = window_get_user_data(window);
   int result;
   if (data->is_timer) {
-    result = alarm_manager_add_alarm(time(NULL) + 60, true,false);
+    result = alarm_manager_add_alarm(time(NULL) + 60, true, data->name, false);
   } else {
-    result = alarm_manager_add_alarm(time(NULL) + 600, false,false);
+    result = alarm_manager_add_alarm(time(NULL) + 600, false, data->name, false);
   }
   if (result == S_SUCCESS) {
     const char* text = data->is_timer ? "Snoozed for 1 minute" : "Snoozed for 10 minutes";

app/src/c/alarms/alarm_window.h

@@ -19,6 +19,6 @@
 
 #include <pebble.h>
 
-void alarm_window_push(time_t alarm_time, bool is_timer);
+void alarm_window_push(time_t alarm_time, bool is_timer, char *name);
 
 #endif

app/src/c/alarms/manager.c

@@ -26,6 +26,7 @@
 struct Alarm {
   time_t scheduled_time;
   WakeupId wakeup_id;
+  char *name;
   bool is_timer; // what's the difference between an alarm and a timer? the user's intention.
 };
 
@@ -44,8 +45,8 @@ static void prv_handle_app_message_inbox_received(DictionaryIterator *iterator,
 static void prv_send_alarm_response(StatusCode response);
 static void prv_wakeup_handler(WakeupId wakeup_id, int32_t cookie);
 
-
 #define MAX_ALARMS 8
+#define ALARM_NAME_SIZE 32
 
 void alarm_manager_init() {
   wakeup_service_subscribe(prv_wakeup_handler);
@@ -55,7 +56,7 @@ void alarm_manager_init() {
   prv_load_alarms();
 }
 
-int alarm_manager_add_alarm(time_t when, bool is_timer, bool conversational) {
+int alarm_manager_add_alarm(time_t when, bool is_timer, char* name, bool conversational) {
   if (s_manager.pending_alarm_count >= MAX_ALARMS) {
     APP_LOG(APP_LOG_LEVEL_WARNING, "Not scheduling alarm because MAX_ALARMS (%d) was already reached.", MAX_ALARMS);
     return E_OUT_OF_RESOURCES;
@@ -82,6 +83,15 @@ int alarm_manager_add_alarm(time_t when, bool is_timer, bool conversational) {
   alarm->scheduled_time = when;
   alarm->is_timer = is_timer;
   alarm->wakeup_id = id;
+  alarm->name = NULL;
+  size_t name_len = 0;
+  if (name) {
+    name_len = strlen(name);
+    if (name_len > 0) {
+      alarm->name = malloc(name_len + 1);
+      strncpy(alarm->name, name, name_len + 1);
+    }
+  }
 
   if (conversational && conversation_manager_get_current()) {
     ConversationManager *conversation_manager = conversation_manager_get_current();
@@ -92,9 +102,16 @@ int alarm_manager_add_alarm(time_t when, bool is_timer, bool conversational) {
           .time = alarm->scheduled_time,
           .is_timer = alarm->is_timer,
           .deleted = false,
+          .name = NULL,
         }
       }
     };
+    // The alarm manager and conversation manager both expect to own the alarm name, so it has to be copied to both
+    // places here.
+    if (name) {
+      action.action.set_alarm.name = malloc(name_len + 1);
+      strncpy(action.action.set_alarm.name, name, name_len + 1);
+    }
     conversation_manager_add_action(conversation_manager, &action);
   }
 
@@ -144,10 +161,12 @@ static void prv_load_alarms() {
   time_t times[MAX_ALARMS];
   WakeupId wakeup_ids[MAX_ALARMS];
   bool is_timers[MAX_ALARMS];
+  char names[MAX_ALARMS][ALARM_NAME_SIZE];
 
   persist_read_data(PERSIST_KEY_ALARM_TIMES, &times, sizeof(times));
   persist_read_data(PERSIST_KEY_ALARM_WAKEUP_IDS, &wakeup_ids, sizeof(wakeup_ids));
   persist_read_data(PERSIST_KEY_ALARM_IS_TIMERS, &is_timers, sizeof(is_timers));
+  persist_read_data(PERSIST_KEY_ALARM_NAMES, &names, sizeof(names));
 
   s_manager.pending_alarms = malloc(sizeof(Alarm) * alarm_count);
   s_manager.pending_alarm_count = alarm_count;
@@ -169,11 +188,21 @@ static void prv_load_alarms() {
     alarm->scheduled_time = times[i];
     alarm->wakeup_id = wakeup_ids[i];
     alarm->is_timer = is_timers[i];
+    size_t name_len = strlen(names[i]);
+    if (name_len >= ALARM_NAME_SIZE) {
+      name_len = ALARM_NAME_SIZE - 1;
+    }
+    if (name_len == 0) {
+      alarm->name = NULL;
+    } else {
+      alarm->name = malloc(name_len + 1);
+      strncpy(alarm->name, names[i], name_len + 1);
+    }
   }
   s_manager.pending_alarm_count = j;
 
   if (did_drop_entries) {
-    APP_LOG(APP_LOG_LEVEL_INFO, "Updating saved data after droping entries.");
+    APP_LOG(APP_LOG_LEVEL_INFO, "Updating saved data after dropping entries.");
     prv_save_alarms();
   }
 }
@@ -185,23 +214,33 @@ static void prv_save_alarms() {
     persist_delete(PERSIST_KEY_ALARM_TIMES);
     persist_delete(PERSIST_KEY_ALARM_WAKEUP_IDS);
     persist_delete(PERSIST_KEY_ALARM_IS_TIMERS);
+    persist_delete(PERSIST_KEY_ALARM_NAMES);
     persist_delete(PERSIST_KEY_ALARM_COUNT_TWO);
     wakeup_cancel_all();
   }
   time_t times[MAX_ALARMS];
   WakeupId wakeup_ids[MAX_ALARMS];
   bool is_timers[MAX_ALARMS];
+  char names[MAX_ALARMS][ALARM_NAME_SIZE];
+  memset(names, 0, sizeof(names));
   for (int i = 0; i < s_manager.pending_alarm_count; ++i) {
     Alarm* alarm = &s_manager.pending_alarms[i];
     times[i] = alarm->scheduled_time;
     wakeup_ids[i] = alarm->wakeup_id;
     is_timers[i] = alarm->is_timer;
+    if (alarm->name) {
+      strncpy(names[i], alarm->name, ALARM_NAME_SIZE);
+      names[i][ALARM_NAME_SIZE - 1] = '\0';
+    } else {
+      names[i][0] = '\0';
+    }
   }
 
   persist_write_int(PERSIST_KEY_ALARM_COUNT_ONE, s_manager.pending_alarm_count);
   persist_write_data(PERSIST_KEY_ALARM_TIMES, &times, sizeof(times));
   persist_write_data(PERSIST_KEY_ALARM_WAKEUP_IDS, &wakeup_ids, sizeof(wakeup_ids));
   persist_write_data(PERSIST_KEY_ALARM_IS_TIMERS, &is_timers, sizeof(is_timers));
+  persist_write_data(PERSIST_KEY_ALARM_NAMES, &names, sizeof(names));
   persist_write_int(PERSIST_KEY_ALARM_COUNT_TWO, s_manager.pending_alarm_count);
   APP_LOG(APP_LOG_LEVEL_INFO, "Wrote %d alarms.", s_manager.pending_alarm_count);
 }
@@ -221,12 +260,22 @@ static void prv_remove_alarm(int to_remove) {
           .time = alarm->scheduled_time,
           .is_timer = alarm->is_timer,
           .deleted = true,
+          .name = NULL,
         }
       }
     };
+    if (alarm->name) {
+      size_t name_len = strlen(alarm->name);
+      action.action.set_alarm.name = malloc(name_len + 1);
+      strncpy(action.action.set_alarm.name, alarm->name, name_len + 1);
+    }
     conversation_manager_add_action(conversation_manager, &action);
   }
 
+  if (alarm->name) {
+    free(alarm->name);
+  }
+
   if (s_manager.pending_alarm_count == 1) {
     free(s_manager.pending_alarms);
     s_manager.pending_alarms = NULL;
@@ -263,7 +312,7 @@ bool alarm_manager_maybe_alarm() {
     APP_LOG(APP_LOG_LEVEL_INFO, "comparing %d == %d", alarm->wakeup_id, id);
     if (alarm->wakeup_id == id) {
       APP_LOG(APP_LOG_LEVEL_INFO, "alarm found! alarming...");
-      alarm_window_push(alarm->scheduled_time, alarm->is_timer);
+      alarm_window_push(alarm->scheduled_time, alarm->is_timer, alarm->name);
       prv_remove_alarm(i);
       return true;
     }
@@ -279,6 +328,10 @@ bool alarm_is_timer(Alarm* alarm) {
   return alarm->is_timer;
 }
 
+char* alarm_get_name(Alarm* alarm) {
+  return alarm->name;
+}
+
 static void prv_handle_set_alarm_request(DictionaryIterator *iterator, void *context) {
   Tuple* tuple = dict_find(iterator, MESSAGE_KEY_SET_ALARM_TIME);
   if (tuple == NULL) {
@@ -294,7 +347,12 @@ static void prv_handle_set_alarm_request(DictionaryIterator *iterator, void *con
   if (is_timer) {
     alarm_time += time(NULL);
   }
-  StatusCode result = alarm_manager_add_alarm(alarm_time, is_timer,true);
+  tuple = dict_find(iterator, MESSAGE_KEY_SET_ALARM_NAME);
+  char* name = NULL;
+  if (tuple != NULL && strlen(tuple->value->cstring) > 0) {
+    name = tuple->value->cstring;
+  }
+  StatusCode result = alarm_manager_add_alarm(alarm_time, is_timer, name, true);
   prv_send_alarm_response(result);
   if (result == S_SUCCESS) {
     APP_LOG(APP_LOG_LEVEL_INFO, "Set alarm for %d (is timer: %d)", alarm_time, is_timer);
@@ -315,7 +373,9 @@ static void prv_handle_get_alarm_request(int16_t is_timer, void* context) {
   for (int i = 0; i < s_manager.pending_alarm_count; ++i) {
     Alarm* alarm = &s_manager.pending_alarms[i];
     if (alarm->is_timer == is_timer) {
-      dict_write_int32(iter, MESSAGE_KEY_GET_ALARM_RESULT + ++write_index, alarm->scheduled_time);
+      ++write_index;
+      dict_write_int32(iter, MESSAGE_KEY_GET_ALARM_RESULT + write_index, alarm->scheduled_time);
+      dict_write_cstring(iter, MESSAGE_KEY_GET_ALARM_NAME + write_index, alarm->name);
     }
   }
   dict_write_int16(iter, MESSAGE_KEY_GET_ALARM_RESULT, write_index);
@@ -394,7 +454,7 @@ static void prv_wakeup_handler(WakeupId wakeup_id, int32_t cookie) {
     APP_LOG(APP_LOG_LEVEL_INFO, "comparing %d == %d", alarm->wakeup_id, wakeup_id);
     if (alarm->wakeup_id == wakeup_id) {
       APP_LOG(APP_LOG_LEVEL_INFO, "alarm found! alarming...");
-      alarm_window_push(alarm->scheduled_time, alarm->is_timer);
+      alarm_window_push(alarm->scheduled_time, alarm->is_timer, alarm->name);
       prv_remove_alarm(i);
       break;
     }

app/src/c/alarms/manager.h

@@ -23,13 +23,14 @@ typedef struct AlarmManager AlarmManager;
 typedef struct Alarm Alarm;
 
 void alarm_manager_init();
-int alarm_manager_add_alarm(time_t when, bool is_timer, bool conversational);
+int alarm_manager_add_alarm(time_t when, bool is_timer, char* name, bool conversational);
 int alarm_manager_cancel_alarm(time_t when, bool is_timer);
 int alarm_manager_get_alarm_count();
 Alarm* alarm_manager_get_alarm(int index);
 bool alarm_manager_maybe_alarm();
 
 time_t alarm_get_time(Alarm* alarm);
 bool alarm_is_timer(Alarm* alarm);
+char* alarm_get_name(Alarm* alarm);
 
 #endif

app/src/c/converse/conversation.c

@@ -68,9 +68,21 @@ void conversation_destroy(Conversation* conversation) {
         free(entry->content.error);
         break;
       case EntryTypeAction:
-        // Only generic sentence actions need further cleanup.
-        if (entry->content.action->type == ConversationActionTypeGenericSentence) {
-          free(entry->content.action->action.generic_sentence.sentence);
+        // Only alarms and generic sentence actions need further cleanup.
+        switch (entry->content.action->type) {
+          case ConversationActionTypeSetAlarm:
+            if (entry->content.action->action.set_alarm.name) {
+              free(entry->content.action->action.set_alarm.name);
+            }
+            break;
+          case ConversationActionTypeGenericSentence:
+            free(entry->content.action->action.generic_sentence.sentence);
+            break;
+          case ConversationActionTypeSetReminder:
+          case ConversationActionTypeDeleteReminder:
+          case ConversationActionTypeUpdateChecklist:
+            // These have nothing to clean up.
+            break;
         }
         free(entry->content.action);
         break;

app/src/c/converse/conversation.h

@@ -40,6 +40,7 @@ typedef struct {
   time_t time;
   bool is_timer;
   bool deleted;
+  char* name;
 } ConversationActionSetAlarm;
 
 typedef struct {