@@ -373,13 +373,22 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     */

     //APP_LOG(APP_LOG_LEVEL_DEBUG, "to display : %s ",s_msg);

-

-    text_layer_set_text(s_upperleft_text_layer, s_altitude);

-    text_layer_set_text(s_upperright_text_layer, s_distance);

-    text_layer_set_text(s_main_text_layer, s_speed);

-    text_layer_set_text(s_lowerleft_text_layer, s_avg_speed);

-    text_layer_set_text(s_lowerright_text_layer, s_max_speed);

-    text_layer_set_text(s_lower_text_layer, s_duration);

+    if(strcmp(s_status, "L200")==0){

+      text_layer_set_text(s_upperleft_text_layer, s_altitude);

+      text_layer_set_text(s_upperright_text_layer, s_distance);

+      text_layer_set_text(s_main_text_layer, s_speed);

+      text_layer_set_text(s_lowerleft_text_layer, s_avg_speed);

+      text_layer_set_text(s_lowerright_text_layer, s_max_speed);

+      text_layer_set_text(s_lower_text_layer, s_duration);

+    }else if(strcmp(s_status, "S200")==0){

+      text_layer_set_text(s_lower_text_layer, "upload OK");

+      vibes_short_pulse();

+    }else if(strcmp(s_status, "S401")==0){

+      text_layer_set_text(s_lower_text_layer, "auth err, retrying");

+    }else{

+      text_layer_set_text(s_lower_text_layer, s_status);

+      vibes_double_pulse();

+    }

   }else{

     //APP_LOG(APP_LOG_LEVEL_DEBUG, "not status message... ");

   }

@@ -181,9 +181,9 @@ function splitFloatNumber(num) {

 // Build GPX headers

 //

 function GPXHeadersBuilder(timestamp, name, type) {

-    var headers = '<?xml version="1.0" encoding="UTF-8"?><gpx creator="Pebble" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd" version="1.1" xmlns="http://www.topografix.com/GPX/1/1"><metadata><time>' + timestamp + '</time></metadata><trk><name>' + name + '</name><type>' + type + '</type><trkseg>';

-    localStorage.setItem("GPX", headers);

-    return true;

+  var headers = '<?xml version="1.0" encoding="UTF-8"?><gpx creator="Pebble" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd" version="1.1" xmlns="http://www.topografix.com/GPX/1/1"><metadata><time>' + timestamp + '</time></metadata><trk><name>' + name + '</name><type>' + type + '</type><trkseg>';

+  localStorage.setItem("GPX", headers);

+  return true;

 }

 // Build GPX track point

@@ -198,11 +198,11 @@ function GPXtrkptBuilder(lat, lon, ele, timestamp) {

 // Build GPX footer

 //

 function GPXfooterBuilder() {

-    var GPX = localStorage.getItem("GPX");

-    var footer = '</trkseg></trk></gpx>';

-    var ret = localStorage.setItem("GPX", GPX + footer);

-    //console.log("GPX closed : " + GPX + footer);

-    return ret;

+  var GPX = localStorage.getItem("GPX");

+  var footer = '</trkseg></trk></gpx>';

+  var ret = localStorage.setItem("GPX", GPX + footer);

+  console.log("GPX closed : " + localStorage.getItem("GPX"));

+  return ret;

 }

 //------------------------------------------

@@ -279,44 +279,58 @@ function SendToStrava() {

     }

-    var bearer = JSON.parse(tokens).access_token;

-    params = {

-        url: "https://www.strava.com/api/v3/uploads",

-        method: "POST",

-        data: { description: "desc", data_type: "gpx" },

-        files: { file: gpxfile },

-        authorization: "Bearer " + bearer,

-        callback: function(e) {

-            var message = "";

-            if (console.log(e.status + " - " + e.txt), 201 == e.status) {

-                message = "Your activity has been created";

-                localStorage.setItem("strava_uploaded", true);

-            } else if (400 == e.status) {

-                message = "An error has occurred. If you've already uploaded the current activity, please delete it in Strava.";

-            } else if (401 == e.status) {

-                message = "Error - Unauthorized. Please check your credentials in the settings."

-            } else {

-                try {

-                    response_json = JSON.parse(e.txt)

-                    response_json.error ? (console.log("error:" + response_json.error), message = response_json.error) : response_json.status && (console.log("status:" + response_json.status))

-                } catch (e) {

-                    console.log("Error log, " + e)

-                }

-            }

-            message && Pebble.showSimpleNotificationOnPebble("Ventoo SE - Strava", message)

+  var bearer = JSON.parse(tokens).access_token;

+  params = {

+    url: "https://www.strava.com/api/v3/uploads",

+    method: "POST",

+    data: { description: "desc", data_type: "gpx" },

+    files: { file: gpxfile },

+    authorization: "Bearer " + bearer,

+    callback: function (e) {

+      var message = "";

+      if (console.log(e.status + " - " + e.txt), 201 == e.status) {

+        message = "S200";

+        localStorage.setItem("strava_uploaded", true);

+      } else if (400 == e.status) {

+        message = "S400";

+      } else if (401 == e.status) {

+        //token expired, retrying

+        message = "S401"

+        SendToStrava()

+      } else {

+        try {

+          response_json = JSON.parse(e.txt)

+          response_json.error ? (console.log("error:" + response_json.error), message = response_json.error) : response_json.status && (console.log("status:" + response_json.status))

+        } catch (err) {

+          console.log("Error log, " + err)

         }

+        message = "S500";

+      }

+      //message && Pebble.showSimpleNotificationOnPebble("Ventoo SE - Strava", message)

+      

+      // Build message

+      var dict = {

+        'status': message

+      };

+      // Send the message

+      Pebble.sendAppMessage(dict, function () {

+        console.log('Message sent successfully: ' + JSON.stringify(dict));

+      }, function (e) {

+        console.log('Message (' + JSON.stringify(dict) + ') failed: ' + JSON.stringify(e));

+      });

     }

-    var XHR = new XMLHttpRequest;

-    var n = this;

-    //console.log(params.url);

-    XHR.open(params.method, params.url, !0);

-    var body = "";

-    var boundary = Math.random().toString().substring(2);

-    XHR.setRequestHeader("content-type", "multipart/form-data; charset=utf-8; boundary=" + boundary)

-    XHR.setRequestHeader("Authorization", params.authorization);

-    for (var i in params.data) body += "--" + boundary + '\r\nContent-Disposition: form-data; name="' + i + '"\r\n\r\n' + params.data[i] + "\r\n";

-    for (var i in params.files) body += "--" + boundary + '\r\nContent-Disposition: form-data; name="' + i + '" ; filename=test.gpx\r\n\r\n' + params.files[i] + "\r\n";

-    body += "--" + boundary + "--\r\n"

+  }

+  var XHR = new XMLHttpRequest;

+  var n = this;

+  //console.log(params.url);

+  XHR.open(params.method, params.url, !0);

+  var body = "";

+  var boundary = Math.random().toString().substring(2);

+  XHR.setRequestHeader("content-type", "multipart/form-data; charset=utf-8; boundary=" + boundary)

+  XHR.setRequestHeader("Authorization", params.authorization);

+  for (var i in params.data) body += "--" + boundary + '\r\nContent-Disposition: form-data; name="' + i + '"\r\n\r\n' + params.data[i] + "\r\n";

+  for (var i in params.files) body += "--" + boundary + '\r\nContent-Disposition: form-data; name="' + i + '" ; filename=test.gpx\r\n\r\n' + params.files[i] + "\r\n";

+  body += "--" + boundary + "--\r\n"

     XHR.onreadystatechange = function() {

         try {

@@ -357,8 +371,8 @@ function PostToWeb() {

         }

     };

-    //send GPX in body

-    xhr.send(GPX);

+  //send GPX in body

+  xhr.send(GPX);

 }

@@ -487,18 +501,18 @@ function locationSuccess(new_pos) {

-        // Build message

-        message = "OK";

-        var dict = {

-            'accuracy': accuracyString,

-            'distance': distanceString,

-            'avg_speed': avgSpeedString,

-            'duration': durationString,

-            'altitude': altitudeString,

-            'speed': speedString,

-            'max_speed': maxSpeedString,

-            'status': message

-        };

+    // Build message

+    message = "L200";

+    var dict = {

+      'accuracy': accuracyString,

+      'distance': distanceString,

+      'avg_speed': avgSpeedString,

+      'duration': durationString,

+      'altitude': altitudeString,

+      'speed': speedString,

+      'max_speed': maxSpeedString,

+      'status': message

+    };

         // Send the message

         Pebble.sendAppMessage(dict, function() {

@@ -558,16 +572,16 @@ function init() {

     if ((se && !su) || (ce && !cu)) {

-        var GPX = localStorage.getItem("GPX");

-        console.log("last 6 char of GPX are " + GPX.substring(GPX.length - 6, GPX.length))

-        if (GPX.substring(GPX.length - 6, GPX.length) !== "</gpx>") {

-            console.log("WARNING - NO GPX FOOTER ")

-                /*var footer = '</trkseg></trk></gpx>';

-                localStorage.setItem("GPX", GPX + footer);*/

-            GPXfooterBuilder();

-            GPX = localStorage.getItem("GPX");

-            console.log("GPX FOOTER is now : " + GPX.substring(GPX.length - 6, GPX.length))

-        }

+    var GPX = localStorage.getItem("GPX");

+    console.log("last 6 char of GPX are " + GPX.substring(GPX.length - 6, GPX.length))

+    if (GPX.substring(GPX.length - 6, GPX.length) !== "</gpx>") {

+        console.log("WARNING - NO GPX FOOTER ")

+            /*var footer = '</trkseg></trk></gpx>';

+            localStorage.setItem("GPX", GPX + footer);*/

+        GPXfooterBuilder();

+        GPX = localStorage.getItem("GPX");

+        console.log("GPX FOOTER is now : " + GPX.substring(GPX.length - 6, GPX.length))

+    }

         if (se) {

             console.log("GPX upload needed to Strava")

@@ -603,48 +617,37 @@ Pebble.addEventListener('ready', function(e) {

 });

 // Get AppMessage events

-Pebble.addEventListener('appmessage', function(e) {

-    // Get the dictionary from the message

-    var dict = e.payload;

-    //console.log(dict[0].toString());

-    switch (dict[0]) {

-        case 'startstop':

-            if (!locationInterval == false) {

-                console.log("Stopping the track");

-                clearInterval(locationInterval);

-                locationInterval = false;

-                clearInterval(instantLocationInterval);

-                instantLocationInterval = false;

-                firstlocationInterval = setInterval(function() {

-                    navigator.geolocation.getCurrentPosition(null, locationError, firstlocationOptions);

-                }, 1000);

-            } else {

-                console.log("Starting the track");

-                start_get_coordinate();

-            }

-            break;

-        case 'send':

-            if (locate_me) {

-                var prev_pos = getLocation(false);

-                instantLocationUpdate(prev_pos);

-            }

-

-            init();

-

-            /*

-            // Send the message

-            var dict = {

-              'status': "EXIT"

-            };

-            Pebble.sendAppMessage(dict, function () {

-              console.log('Message sent successfully: ' + JSON.stringify(dict));

-            }, function (e) {

-              console.log('Message (' + JSON.stringify(dict) + ') failed: ' + JSON.stringify(e));

-            });

-            */

-            break;

-        default:

-            console.log('Sorry. I don\'t understand your request :' + dict[0]);

-    }

+Pebble.addEventListener('appmessage', function (e) {

+  // Get the dictionary from the message

+  var dict = e.payload;

+  //console.log(dict[0].toString());

+  switch (dict[0]) {

+    case 'startstop':

+      if (!locationInterval == false) {

+        console.log("Stopping the track");

+        clearInterval(locationInterval);

+        locationInterval = false;

+        clearInterval(instantLocationInterval);

+        instantLocationInterval = false;

+        /*firstlocationInterval = setInterval(function () {

+          navigator.geolocation.getCurrentPosition(null, locationError, firstlocationOptions);

+        }, 1000);*/

+      } else {

+        console.log("Starting the track");

+        start_get_coordinate();

+      }

+      break;

+    case 'send':

+      if (locate_me) {

+        var prev_pos = getLocation(false);

+        instantLocationUpdate(prev_pos);

+      }

+      

+      init();

+

+      break;

+    default:

+      console.log('Sorry. I don\'t understand your request :' + dict[0]);

+  }

 });

\ No newline at end of file