@@ -77,12 +77,12 @@ static void send_message(char * msg){

 static void prv_select_click_handler(ClickRecognizerRef recognizer, void *context) {

   text_layer_set_text(s_main_text_layer, "");

-  text_layer_set_text(s_lower_text_layer, "sending get geoloc");

+  text_layer_set_text(s_lower_text_layer, "started/stopped");

   send_message("startstop");

 }

 static void prv_up_click_handler(ClickRecognizerRef recognizer, void *context) {

-  text_layer_set_text(s_lower_text_layer, "Tracking stopped, sending track...");

+  text_layer_set_text(s_lower_text_layer, "uploading...");

   send_message("send");

 }

@@ -218,25 +218,20 @@ function getTokens(code) {

   xhr.open("POST", url, false);

-  xhr.onload = function () {

-    //console.log('------xhr onloaded')

-    if (xhr.readyState === 4) {

-      console.log('------xhr request returned :', xhr.responseText);

-      response_json = JSON.parse(xhr.responseText);

-

-      var tokenjson = {

-        access_token: response_json.access_token,

-        refresh_token: response_json.refresh_token,

-        expiry: response_json.expires_at,

-        delay: response_json.expires_in

-      };

-      localStorage.setItem("strava_tokens", JSON.stringify(tokenjson));

-

-    }

-  };

-

   xhr.send();

+  if (xhr.status === 200) {

+    console.log('------xhr request returned :', xhr.responseText);

+    response_json = JSON.parse(xhr.responseText);

+

+    var tokenjson = {

+      access_token: response_json.access_token,

+      refresh_token: response_json.refresh_token,

+      expiry: response_json.expires_at,

+      delay: response_json.expires_in

+    };

+    localStorage.setItem("strava_tokens", JSON.stringify(tokenjson));

+  }

 }

 function refreshTokens(refresh_token) {

@@ -248,24 +243,21 @@ function refreshTokens(refresh_token) {

   xhr.open("POST", url, false);

-  xhr.onload = function () {

-    //console.log('------Refresh token - xhr onloaded')

-    if (xhr.readyState === 4) {

-      console.log('------Refresh token - xhr request returned with ' + xhr.responseText);

-      response_json = JSON.parse(xhr.responseText);

-

-      var tokenjson = {

-        access_token: response_json.access_token,

-        refresh_token: response_json.refresh_token,

-        expiry: response_json.expires_at,

-        delay: response_json.expires_in

-      };

-      localStorage.setItem("strava_tokens", JSON.stringify(tokenjson));

-

-    }

-  };

-

   xhr.send();

+  //console.log('------Refresh token - xhr onloaded')

+  if (xhr.status === 200) {

+    console.log('------Refresh token - xhr request returned with ' + xhr.responseText);

+    response_json = JSON.parse(xhr.responseText);

+

+    var tokenjson = {

+      access_token: response_json.access_token,

+      refresh_token: response_json.refresh_token,

+      expiry: response_json.expires_at,

+      delay: response_json.expires_in

+    };

+    localStorage.setItem("strava_tokens", JSON.stringify(tokenjson));

+

+  }

 }

@@ -567,6 +559,13 @@ function init() {

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

     if (se) {

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

+

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

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

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

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

+        GPXfooterBuilder();

+      }

       SendToStrava();

     }

@@ -608,7 +607,6 @@ Pebble.addEventListener('appmessage', function (e) {

       if (!locationInterval == false) {

         console.log("Stopping the track");

         clearInterval(locationInterval);

-        GPXfooterBuilder();

         locationInterval = false;

         clearInterval(instantLocationInterval);

         instantLocationInterval = false;