@@ -17,10 +17,12 @@

 #include <inttypes.h>

 #include <pebble.h>

+#include "dict_tools.h"

 #include "progress_layer.h"

 #define MSG_KEY_LAST_SENT	110

 #define MSG_KEY_MODAL_MESSAGE	120

+#define MSG_KEY_UPLOAD_DONE	130

 #define MSG_KEY_DATA_KEY	210

 #define MSG_KEY_DATA_LINE	220

@@ -42,31 +44,49 @@ static struct {

 	ProgressLayer	*progress_layer;

 	uint32_t	first_key;

 	uint32_t	current_key;

-} ui;

+} phone, web;

 static void

 set_modal_mode(bool is_modal) {

 	if (is_modal == modal_displayed) return;

 	layer_set_hidden(text_layer_get_layer(modal_text_layer), !is_modal);

-	layer_set_hidden(text_layer_get_layer(ui.label_layer), is_modal);

-	layer_set_hidden(ui.progress_layer, is_modal);

+	layer_set_hidden(text_layer_get_layer(phone.label_layer), is_modal);

+	layer_set_hidden(phone.progress_layer, is_modal);

+	layer_set_hidden(text_layer_get_layer(web.label_layer), is_modal);

+	layer_set_hidden(web.progress_layer, is_modal);

 	modal_displayed = is_modal;

 }

 static void

 update_progress(void) {

 	int32_t last_key = (time(0) + 59) / 60;

-	int32_t key_span = last_key - ui.first_key;

-	int32_t keys_done = ui.current_key - ui.first_key + 1;

-	progress_layer_set_progress(ui.progress_layer,

-	    (keys_done * 100 + key_span / 2) / key_span);

-	snprintf(ui.label, sizeof ui.label, "%" PRIi32 " / %" PRIi32,

-	    keys_done, key_span);

+	if (phone.current_key) {

+		int32_t key_span = last_key - phone.first_key;

+		int32_t keys_done = phone.current_key - phone.first_key + 1;

+

+		progress_layer_set_progress(phone.progress_layer,

+		    (keys_done * 100 + key_span / 2) / key_span);

+		snprintf(phone.label, sizeof phone.label,

+		    "%" PRIi32 " / %" PRIi32,

+		    keys_done, key_span);

+	}

+

+	if (web.current_key) {

+		int32_t key_span = last_key - web.first_key;

+		int32_t keys_done = web.current_key - web.first_key + 1;

+

+		progress_layer_set_progress(web.progress_layer,

+		    (keys_done * 100 + key_span / 2) / key_span);

+		snprintf(web.label, sizeof web.label,

+		    "%" PRIi32 " / %" PRIi32,

+		    keys_done, key_span);

+	}

 }

 #define PROGRESS_HEIGHT 10

 #define PROGRESS_MARGIN 8

+#define LABEL_MARGIN (PROGRESS_HEIGHT + PROGRESS_MARGIN)

 #define LABEL_HEIGHT 22

 static void

@@ -82,26 +102,47 @@ window_load(Window *window) {

 	    fonts_get_system_font(FONT_KEY_GOTHIC_24_BOLD));

 	layer_add_child(window_layer, text_layer_get_layer(modal_text_layer));

-	ui.label_layer = text_layer_create(GRect(0,

-	    bounds.size.h / 2 - LABEL_HEIGHT - PROGRESS_MARGIN / 2,

+	phone.label_layer = text_layer_create(GRect(0,

+	    bounds.size.h / 2 - LABEL_HEIGHT - LABEL_MARGIN,

 	    bounds.size.w,

 	    LABEL_HEIGHT));

-	text_layer_set_text(ui.label_layer, ui.label);

-	text_layer_set_text_alignment(ui.label_layer, GTextAlignmentCenter);

-	text_layer_set_font(ui.label_layer,

+	text_layer_set_text(phone.label_layer, phone.label);

+	text_layer_set_text_alignment(phone.label_layer, GTextAlignmentCenter);

+	text_layer_set_font(phone.label_layer,

 	    fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

-	layer_add_child(window_layer, text_layer_get_layer(ui.label_layer));

+	layer_add_child(window_layer, text_layer_get_layer(phone.label_layer));

+

+	phone.progress_layer = progress_layer_create(GRect(bounds.size.w / 4,

+	    bounds.size.h / 2 - PROGRESS_HEIGHT - PROGRESS_MARGIN / 2,

+	    bounds.size.w / 2,

+	    PROGRESS_HEIGHT));

+	progress_layer_set_progress(phone.progress_layer, 0);

+	progress_layer_set_corner_radius(phone.progress_layer, 3);

+	progress_layer_set_foreground_color(phone.progress_layer, GColorBlack);

+	progress_layer_set_background_color(phone.progress_layer,

+	    GColorLightGray);

+	layer_add_child(window_layer, phone.progress_layer);

-	ui.progress_layer = progress_layer_create(GRect(bounds.size.w / 4,

+	web.progress_layer = progress_layer_create(GRect(bounds.size.w / 4,

 	    bounds.size.h / 2 + PROGRESS_MARGIN / 2,

 	    bounds.size.w / 2,

 	    PROGRESS_HEIGHT));

-	progress_layer_set_progress(ui.progress_layer, 0);

-	progress_layer_set_corner_radius(ui.progress_layer, 3);

-	progress_layer_set_foreground_color(ui.progress_layer, GColorBlack);

-	progress_layer_set_background_color(ui.progress_layer,

+	progress_layer_set_progress(web.progress_layer, 0);

+	progress_layer_set_corner_radius(web.progress_layer, 3);

+	progress_layer_set_foreground_color(web.progress_layer, GColorBlack);

+	progress_layer_set_background_color(web.progress_layer,

 	    GColorLightGray);

-	layer_add_child(window_layer, ui.progress_layer);

+	layer_add_child(window_layer, web.progress_layer);

+

+	web.label_layer = text_layer_create(GRect(0,

+	    bounds.size.h / 2 + LABEL_MARGIN,

+	    bounds.size.w,

+	    LABEL_HEIGHT));

+	text_layer_set_text(web.label_layer, web.label);

+	text_layer_set_text_alignment(web.label_layer, GTextAlignmentCenter);

+	text_layer_set_font(web.label_layer,

+	    fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

+	layer_add_child(window_layer, text_layer_get_layer(web.label_layer));

 	set_modal_mode(true);

 }

@@ -109,8 +150,10 @@ window_load(Window *window) {

 static void

 window_unload(Window *window) {

 	text_layer_destroy(modal_text_layer);

-	text_layer_destroy(ui.label_layer);

-	progress_layer_destroy(ui.progress_layer);

+	text_layer_destroy(phone.label_layer);

+	text_layer_destroy(web.label_layer);

+	progress_layer_destroy(phone.progress_layer);

+	progress_layer_destroy(web.progress_layer);

 }

 static void

@@ -225,8 +268,8 @@ send_minute_data(HealthMinuteData *data, HealthActivityMask activity_mask,

 		    (int)msg_result);

 	}

-	if (!ui.first_key) ui.first_key = int_key;

-	ui.current_key = int_key;

+	if (!phone.first_key) phone.first_key = int_key;

+	phone.current_key = int_key;

 	update_progress();

 	APP_LOG(APP_LOG_LEVEL_INFO, "sent data for key %" PRIi32, int_key);

@@ -346,6 +389,13 @@ inbox_received_handler(DictionaryIterator *iterator, void *context) {

 			set_modal_message(tuple->value->cstring);

 		}

 	}

+

+	tuple = dict_find(iterator, MSG_KEY_UPLOAD_DONE);

+	if (tuple) {

+		web.current_key = tuple_uint(tuple);

+		if (!web.first_key) web.first_key = web.current_key;

+		update_progress();

+	}

 }

 static void