@@ -18,6 +18,8 @@

     "uploadStart": 140,

     "dataKey": 210,

     "dataLine": 220,

+    "cfgStart": 301,

+    "cfgEnd": 302,

     "cfgAutoClose": 310

   },

   "resources": {

@@ -132,6 +132,8 @@ Pebble.addEventListener("appmessage", function(e) {

 Pebble.addEventListener("showConfiguration", function() {

    var settings = "?v=1.0";

+   Pebble.sendAppMessage({ "cfgStart": 1 });

+

    if (cfg_endpoint) {

       settings += "&url=" + encodeURIComponent(cfg_endpoint);

    }

@@ -162,6 +164,7 @@ Pebble.addEventListener("showConfiguration", function() {

 Pebble.addEventListener("webviewclosed", function(e) {

    var configData = JSON.parse(decodeURIComponent(e.response));

    var wasConfigured = (cfg_endpoint && cfg_data_field);

+   var msg = { "cfgEnd": 1 };

    if (configData.url) {

       cfg_endpoint = configData.url;

@@ -212,7 +215,7 @@ Pebble.addEventListener("webviewclosed", function(e) {

    if (configData.autoClose !== null) {

       cfg_auto_close = configData.autoClose;

       localStorage.setItem("cfgAutoClose", cfg_auto_close);

-      Pebble.sendAppMessage({ "cfgAutoClose": cfg_auto_close ? 1 : 0 });

+      msg.cfgAutoClose = cfg_auto_close ? 1 : 0;

    }

    console.log(cfg_sign_field ? "Signature enabled" : "Signature disabled");

@@ -227,6 +230,8 @@ Pebble.addEventListener("webviewclosed", function(e) {

    }

    if (!wasConfigured && cfg_endpoint && cfg_data_field) {

-      Pebble.sendAppMessage({ "lastSent": 0 });

+      msg.lastSent = 0;

    }

+

+   Pebble.sendAppMessage(msg);

 });

@@ -26,6 +26,8 @@

 #define MSG_KEY_UPLOAD_START	140

 #define MSG_KEY_DATA_KEY	210

 #define MSG_KEY_DATA_LINE	220

+#define MSG_KEY_CFG_START	301

+#define MSG_KEY_CFG_END		302

 #define MSG_KEY_CFG_AUTO_CLOSE	310

 static Window *window;

@@ -40,7 +42,9 @@ static bool modal_displayed = false;

 static bool display_dirty = false;

 static char global_buffer[1024];

 static bool sending_data = false;

+static bool cfg_auto_close = false;

 static bool auto_close = false;

+static bool configuring = false;

 static struct widget {

 	char		label[64];

@@ -463,12 +467,26 @@ inbox_received_handler(DictionaryIterator *iterator, void *context) {

 	tuple = dict_find(iterator, MSG_KEY_CFG_AUTO_CLOSE);

 	if (tuple) {

-		auto_close = (tuple_uint(tuple) != 0);

+		auto_close = cfg_auto_close = (tuple_uint(tuple) != 0);

 		persist_write_bool(MSG_KEY_CFG_AUTO_CLOSE, auto_close);

 		if (auto_close && !sending_data

 		    && web.current_key >= phone.current_key)

 			close_app();

 	}

+

+	tuple = dict_find(iterator, MSG_KEY_CFG_START);

+	if (tuple) {

+		APP_LOG(APP_LOG_LEVEL_INFO, "Starting configuration");

+		auto_close = false;

+		configuring = true;

+	}

+

+	tuple = dict_find(iterator, MSG_KEY_CFG_END);

+	if (tuple) {

+		APP_LOG(APP_LOG_LEVEL_INFO, "End of configuration");

+		auto_close = cfg_auto_close;

+		configuring = false;

+	}

 }

 static void

@@ -495,9 +513,7 @@ tick_handler(struct tm *tick_time, TimeUnits units_changed) {

 static void

 init(void) {

-	auto_close = persist_read_bool(MSG_KEY_CFG_AUTO_CLOSE);

-	APP_LOG(APP_LOG_LEVEL_INFO, "auto_close initialized to %s",

-	    auto_close ? "true" : "false");

+	cfg_auto_close = persist_read_bool(MSG_KEY_CFG_AUTO_CLOSE);

 	app_message_register_inbox_received(inbox_received_handler);

 	app_message_register_outbox_failed(outbox_failed_handler);