7k of savings for deleting all the logs.

Signed-off-by: Katharine Berry <[email protected]>

Author: Katharine

app/src/c/alarms/manager.c

@@ -59,25 +59,25 @@ void alarm_manager_init() {
 
 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);
+    //APP_LOG(APP_LOG_LEVEL_WARNING, "Not scheduling alarm because MAX_ALARMS (%d) was already reached.", MAX_ALARMS);
     return E_OUT_OF_RESOURCES;
   }
   WakeupId id = wakeup_schedule(when, when, true);
-  APP_LOG(APP_LOG_LEVEL_INFO, "wakeup_schedule(%d, %d, true) -> %d", when, when, id);
+  //APP_LOG(APP_LOG_LEVEL_INFO, "wakeup_schedule(%d, %d, true) -> %d", when, when, id);
   if (id == E_RANGE) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Scheduling alarm failed: E_RANGE (there's another event already scheduled then)");
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Scheduling alarm failed: E_RANGE (there's another event already scheduled then)");
     return id;
   }
   if (id == E_INVALID_ARGUMENT) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Scheduling alarm failed: E_INVALID_ARGUMENT (the time is in the past)");
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Scheduling alarm failed: E_INVALID_ARGUMENT (the time is in the past)");
     return id;
   }
   if (id == E_OUT_OF_RESOURCES) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Scheduling alarm failed: E_OUT_OF_RESOURCES (already eight alarms scheduled)");
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Scheduling alarm failed: E_OUT_OF_RESOURCES (already eight alarms scheduled)");
     return id;
   }
   if (id < 0) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Scheduling alarm failed: %d (Pebble internal error)");
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Scheduling alarm failed: %d (Pebble internal error)");
     return id;
   }
   Alarm* alarm = bmalloc(sizeof(Alarm));
@@ -187,7 +187,7 @@ static void prv_load_alarms() {
   int alarm_count = alarm_count_one < alarm_count_two ? alarm_count_one : alarm_count_two;
 
   if (alarm_count == 0) {
-    APP_LOG(APP_LOG_LEVEL_INFO, "No alarms known. Deleting all alarms to ensure consistency.");
+    //APP_LOG(APP_LOG_LEVEL_INFO, "No alarms known. Deleting all alarms to ensure consistency.");
     wakeup_cancel_all();
     return;
   }
@@ -214,7 +214,7 @@ static void prv_load_alarms() {
   int j = 0;
   for (int i = 0; i < alarm_count; ++i) {
     if (!wakeup_query(wakeup_ids[i], NULL) && (!launched_for_wakeup || launch_id != wakeup_ids[i])) {
-      APP_LOG(APP_LOG_LEVEL_WARNING, "Alarm %d (scheduled for %d) no longer exists; dropping.", wakeup_ids[i], times[i]);
+      //APP_LOG(APP_LOG_LEVEL_WARNING, "Alarm %d (scheduled for %d) no longer exists; dropping.", wakeup_ids[i], times[i]);
       did_drop_entries = true;
       continue;
     }
@@ -236,14 +236,14 @@ static void prv_load_alarms() {
   s_manager.pending_alarm_count = j;
 
   if (did_drop_entries) {
-    APP_LOG(APP_LOG_LEVEL_INFO, "Updating saved data after dropping entries.");
+    //APP_LOG(APP_LOG_LEVEL_INFO, "Updating saved data after dropping entries.");
     prv_save_alarms();
   }
 }
 
 static void prv_save_alarms() {
   if (s_manager.pending_alarm_count == 0) {
-    APP_LOG(APP_LOG_LEVEL_INFO, "No alarms to save. Deleting everything.");
+    //APP_LOG(APP_LOG_LEVEL_INFO, "No alarms to save. Deleting everything.");
     persist_delete(PERSIST_KEY_ALARM_COUNT_ONE);
     persist_delete(PERSIST_KEY_ALARM_TIMES);
     persist_delete(PERSIST_KEY_ALARM_WAKEUP_IDS);
@@ -276,7 +276,7 @@ static void prv_save_alarms() {
   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);
+  //APP_LOG(APP_LOG_LEVEL_INFO, "Wrote %d alarms.", s_manager.pending_alarm_count);
 }
 
 static void prv_remove_alarm(int to_remove) {
@@ -331,21 +331,21 @@ static void prv_remove_alarm(int to_remove) {
 
 bool alarm_manager_maybe_alarm() {
   if (launch_reason() != APP_LAUNCH_WAKEUP) {
-    APP_LOG(APP_LOG_LEVEL_DEBUG, "Not launched by APP_LAUNCH_WAKEUP");
+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "Not launched by APP_LAUNCH_WAKEUP");
     return false;
   }
-  APP_LOG(APP_LOG_LEVEL_INFO, "Launched by APP_LAUNCH_WAKEUP");
+  //APP_LOG(APP_LOG_LEVEL_INFO, "Launched by APP_LAUNCH_WAKEUP");
   WakeupId id;
   int32_t cookie;
   if (!wakeup_get_launch_event(&id, &cookie)) {
     return false;
   }
-  APP_LOG(APP_LOG_LEVEL_INFO, "WakeupId: %d, cookie: %d", id, cookie);
+  //APP_LOG(APP_LOG_LEVEL_INFO, "WakeupId: %d, cookie: %d", id, cookie);
   for (int i = 0; i < s_manager.pending_alarm_count; ++i) {
     Alarm* alarm = &s_manager.pending_alarms[i];
-    APP_LOG(APP_LOG_LEVEL_INFO, "comparing %d == %d", alarm->wakeup_id, id);
+    //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...");
+      //APP_LOG(APP_LOG_LEVEL_INFO, "alarm found! alarming...");
       alarm_window_push(alarm->scheduled_time, alarm->is_timer, alarm->name);
       prv_remove_alarm(i);
       return true;
@@ -389,18 +389,18 @@ static void prv_handle_set_alarm_request(DictionaryIterator *iterator, void *con
   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);
+    //APP_LOG(APP_LOG_LEVEL_INFO, "Set alarm for %d (is timer: %d)", alarm_time, is_timer);
   } else {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Setting alarm for %d failed: %d", alarm_time, result);
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Setting alarm for %d failed: %d", alarm_time, result);
   }
 }
 
 static void prv_handle_get_alarm_request(int16_t is_timer, void* context) {
   DictionaryIterator *iter;
-  APP_LOG(APP_LOG_LEVEL_INFO, "Retrieving alarms or possibly timers (%d).", is_timer);
+  //APP_LOG(APP_LOG_LEVEL_INFO, "Retrieving alarms or possibly timers (%d).", is_timer);
   AppMessageResult result = app_message_outbox_begin(&iter);
   if (result != APP_MSG_OK) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Opening dict to respond failed: %d.", result);
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Opening dict to respond failed: %d.", result);
     return;
   }
   int write_index = 0;
@@ -416,10 +416,10 @@ static void prv_handle_get_alarm_request(int16_t is_timer, void* context) {
   dict_write_int32(iter, MESSAGE_KEY_CURRENT_TIME, time(NULL));
   result = app_message_outbox_send();
   if (result != APP_MSG_OK) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Sending alarm list to phone failed: %d.", result);
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Sending alarm list to phone failed: %d.", result);
     return;
   }
-  APP_LOG(APP_LOG_LEVEL_INFO, "Sent alarm list.");
+  //APP_LOG(APP_LOG_LEVEL_INFO, "Sent alarm list.");
 }
 
 static void prv_handle_cancel_alarm_request(DictionaryIterator* iterator, void* context) {
@@ -469,25 +469,25 @@ static void prv_send_alarm_response(StatusCode response) {
   DictionaryIterator *iter;
   AppMessageResult result = app_message_outbox_begin(&iter);
   if (result != APP_MSG_OK) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Returning status code %d to phone failed in open: %d.", response, result);
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Returning status code %d to phone failed in open: %d.", response, result);
     return;
   }
   dict_write_int32(iter, MESSAGE_KEY_SET_ALARM_RESULT, response);
   result = app_message_outbox_send();
   if (result != APP_MSG_OK) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Returning status code %d to phone failed in send: %d.", response, result);
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Returning status code %d to phone failed in send: %d.", response, result);
     return;
   }
-  APP_LOG(APP_LOG_LEVEL_INFO, "Sent alarm response %d", response);
+  //APP_LOG(APP_LOG_LEVEL_INFO, "Sent alarm response %d", response);
 }
 
 static void prv_wakeup_handler(WakeupId wakeup_id, int32_t cookie) {
-  APP_LOG(APP_LOG_LEVEL_INFO, "it's the wakeup handler! (%d, %d)", wakeup_id, cookie);
+  //APP_LOG(APP_LOG_LEVEL_INFO, "it's the wakeup handler! (%d, %d)", wakeup_id, cookie);
   for (int i = 0; i < s_manager.pending_alarm_count; ++i) {
     Alarm* alarm = &s_manager.pending_alarms[i];
-    APP_LOG(APP_LOG_LEVEL_INFO, "comparing %d == %d", alarm->wakeup_id, wakeup_id);
+    //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...");
+      //APP_LOG(APP_LOG_LEVEL_INFO, "alarm found! alarming...");
       alarm_window_push(alarm->scheduled_time, alarm->is_timer, alarm->name);
       prv_remove_alarm(i);
       break;

app/src/c/assistant.c

@@ -53,7 +53,7 @@ static void prv_deinit(void) {
 
 int main(void) {
   VersionInfo version_info = version_get_current();
-  APP_LOG(APP_LOG_LEVEL_INFO, "Bobby %d.%d", version_info.major, version_info.minor);
+  //APP_LOG(APP_LOG_LEVEL_INFO, "Bobby %d.%d", version_info.major, version_info.minor);
   prv_init();
 
   if (alarm_manager_maybe_alarm()) {

app/src/c/consent/consent.c

@@ -80,13 +80,13 @@ void consent_migrate() {
     // If we're updating from version 1.1 or older, consent agreement was implied by LOCATION_ENABLED being set
     // (either true or false).
     if (version_info_compare(version_get_last_launch(), (VersionInfo) {1, 1}) <= 0) {
-      APP_LOG(APP_LOG_LEVEL_INFO, "Performing consent migration from version 1.1.");
+      //APP_LOG(APP_LOG_LEVEL_INFO, "Performing consent migration from version 1.1.");
       // If the location enabled state is set, that's equivalent to consent agreement version 1.
       if (persist_exists(PERSIST_KEY_LOCATION_ENABLED)) {
-        APP_LOG(APP_LOG_LEVEL_INFO, "Marking consent as 1.");;
+        //APP_LOG(APP_LOG_LEVEL_INFO, "Marking consent as 1.");;
         persist_write_int(PERSIST_KEY_CONSENTS_COMPLETED, 1);
       } else {
-        APP_LOG(APP_LOG_LEVEL_INFO, "Not marking consent.");;
+        //APP_LOG(APP_LOG_LEVEL_INFO, "Not marking consent.");;
       }
     }
   }
@@ -174,7 +174,7 @@ static void prv_set_stage(Window* window, int stage) {
     data->title_text = "Location";
     break;
   default:
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Unknown consent stage: %d", stage);
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Unknown consent stage: %d", stage);
     return;
   }
   if (res_handle != NULL) {
@@ -210,7 +210,7 @@ static void prv_select_click_handler(ClickRecognizerRef recognizer, void *contex
   Window* window = context;
   ConsentWindowData *data = window_get_user_data(window);
   if (!prv_did_scroll_to_bottom(window)) {
-    APP_LOG(APP_LOG_LEVEL_DEBUG, "User clicked select but hasn't scrolled to bottom; ignoring.");
+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "User clicked select but hasn't scrolled to bottom; ignoring.");
     return;
   }
   switch (data->stage) {
@@ -261,15 +261,15 @@ static void prv_app_message_handler(DictionaryIterator *iter, void *context) {
   Window* window = context;
   ConsentWindowData* data = window_get_user_data(window);
   if (data->expected_app_response != STAGE_LOCATION_CONSENT) {
-    APP_LOG(APP_LOG_LEVEL_WARNING, "Ignoring unexpected location consent response.");
+    //APP_LOG(APP_LOG_LEVEL_WARNING, "Ignoring unexpected location consent response.");
     return;
   }
   Tuple *tuple = dict_find(iter, MESSAGE_KEY_LOCATION_ENABLED);
   if (tuple == NULL) {
     return;
   }
   data->expected_app_response = 0;
-  APP_LOG(APP_LOG_LEVEL_INFO, "Got location enabled reply, dismissing dialog.");
+  //APP_LOG(APP_LOG_LEVEL_INFO, "Got location enabled reply, dismissing dialog.");
   events_app_message_unsubscribe(data->app_message_handle);
   bool location_enabled = tuple->value->int16;
   persist_write_bool(PERSIST_KEY_LOCATION_ENABLED, location_enabled);

app/src/c/converse/conversation.c

@@ -181,9 +181,9 @@ static void prv_append_to_response(ConversationResponse *response, const char* f
   while (response->len + len >= response->allocated) {
     response->allocated *= 2;
     char* new_resp = bmalloc(response->allocated);
-    APP_LOG(APP_LOG_LEVEL_INFO, "Expanding buffer to %d bytes. New buffer: %p. Old buffer: %p.", response->allocated, new_resp, response->response);
+    //APP_LOG(APP_LOG_LEVEL_INFO, "Expanding buffer to %d bytes. New buffer: %p. Old buffer: %p.", response->allocated, new_resp, response->response);
     strcpy(new_resp, response->response);
-    APP_LOG(APP_LOG_LEVEL_INFO, "Copied %d bytes.", strlen(response->response) + 1);
+    //APP_LOG(APP_LOG_LEVEL_INFO, "Copied %d bytes.", strlen(response->response) + 1);
     free(response->response);
     response->response = new_resp;
   }
@@ -219,7 +219,7 @@ bool conversation_add_response_fragment(Conversation* conversation, const char*
 void conversation_complete_response(Conversation *conversation) {
   ConversationResponse* response = prv_find_last_open_response(conversation);
   if (response == NULL) {
-    APP_LOG(APP_LOG_LEVEL_WARNING, "Trying to complete a response, but couldn't find any.");
+    //APP_LOG(APP_LOG_LEVEL_WARNING, "Trying to complete a response, but couldn't find any.");
     return;
   }
   response->complete = true;
@@ -266,15 +266,15 @@ void conversation_delete_first_entry(Conversation* conversation) {
 
 ConversationEntry* conversation_entry_at_index(Conversation* conversation, int index) {
   if (index >= conversation->entry_count) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Caller asked for entry %d, but only %d exist.", index, conversation->entry_count);
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Caller asked for entry %d, but only %d exist.", index, conversation->entry_count);
     return NULL;
   }
   return &conversation->entries[index];
 }
 
 ConversationEntry* conversation_peek(Conversation* conversation) {
   if (conversation->entry_count == conversation->deleted_entries) {
-    APP_LOG(APP_LOG_LEVEL_WARNING, "Tried to peek at conversation, but no entries yet.");
+    //APP_LOG(APP_LOG_LEVEL_WARNING, "Tried to peek at conversation, but no entries yet.");
     return NULL;
   }
   return &conversation->entries[conversation->entry_count-1];
@@ -310,47 +310,47 @@ const char* prv_type_to_string(EntryType type) {
 
 ConversationPrompt* conversation_entry_get_prompt(ConversationEntry* entry) {
   if (entry->type != EntryTypePrompt) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Asked for prompt %p, but it's actually a %s.", entry, prv_type_to_string(entry->type));
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Asked for prompt %p, but it's actually a %s.", entry, prv_type_to_string(entry->type));
     return NULL;
   }
   return entry->content.prompt;
 }
 
 ConversationResponse* conversation_entry_get_response(ConversationEntry* entry) {
   if (entry->type != EntryTypeResponse) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Asked for response %p, but it's actually a %s.", entry, prv_type_to_string(entry->type));
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Asked for response %p, but it's actually a %s.", entry, prv_type_to_string(entry->type));
     return NULL;
   }
   return entry->content.response;
 }
 
 ConversationThought* conversation_entry_get_thought(ConversationEntry* entry) {
   if (entry->type != EntryTypeThought) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Asked for thought %p, but it's actually a %s.", entry, prv_type_to_string(entry->type));
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Asked for thought %p, but it's actually a %s.", entry, prv_type_to_string(entry->type));
     return NULL;
   }
   return entry->content.thought;
 }
 
 ConversationError* conversation_entry_get_error(ConversationEntry* entry) {
   if (entry->type != EntryTypeError) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Asked for error %p, but it's actually a %s.", entry, prv_type_to_string(entry->type));
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Asked for error %p, but it's actually a %s.", entry, prv_type_to_string(entry->type));
     return NULL;
   }
   return entry->content.error;
 }
 
 ConversationAction* conversation_entry_get_action(ConversationEntry* action) {
   if (action->type != EntryTypeAction) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Asked for action %p, but it's actually a %s.", action, prv_type_to_string(action->type));
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Asked for action %p, but it's actually a %s.", action, prv_type_to_string(action->type));
     return NULL;
   }
   return action->content.action;
 }
 
 ConversationWidget* conversation_entry_get_widget(ConversationEntry* widget) {
   if (widget->type != EntryTypeWidget) {
-    APP_LOG(APP_LOG_LEVEL_ERROR, "Asked for widget %p, but it's actually a %s.", widget, prv_type_to_string(widget->type));
+    //APP_LOG(APP_LOG_LEVEL_ERROR, "Asked for widget %p, but it's actually a %s.", widget, prv_type_to_string(widget->type));
     return NULL;
   }
   return widget->content.widget;
@@ -361,7 +361,7 @@ EntryType conversation_entry_get_type(ConversationEntry* entry) {
 }
 
 void conversation_set_thread_id(Conversation* conversation, const char* thread_id) {
-  APP_LOG(APP_LOG_LEVEL_INFO, "Thread ID updated: %s", thread_id);
+  //APP_LOG(APP_LOG_LEVEL_INFO, "Thread ID updated: %s", thread_id);
   strncpy(conversation->thread_id, thread_id, 37);
 }