@@ -71,16 +71,17 @@ static void prv_select_click_handler(ClickRecognizerRef recognizer, void *contex

 }

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

-  //text_layer_set_text(s_other_text_layer, "Up");

+  text_layer_set_text(s_other_text_layer, "Tracking stopped, sending...");

+  send_message("exit");

 }

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

-  //text_layer_set_text(s_other_text_layer, "Down");

+  text_layer_set_text(s_other_text_layer, "Tracking stopped, sending...");

   send_message("exit");

 }

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

-  //text_layer_set_text(s_other_text_layer, "Down");

+  //text_layer_set_text(s_other_text_layer, "back");

   //send_message("exit");

 }

@@ -120,14 +121,14 @@ static void prv_window_unload(Window *window) {

 void comm_is_ready() {

   // set the text

-  text_layer_set_text(s_speed_text_layer, "Press a button to start");

-  text_layer_set_text(s_other_text_layer, "Welcome to Bike Companion ! JSready");

+  text_layer_set_text(s_speed_text_layer, "Press Select");

+  text_layer_set_text(s_other_text_layer, "Welcome to Bike Companion ! JS is ready");

 }

 static void inbox_received_callback(DictionaryIterator *iter, void *context) {

   // A new message has been successfully received

-  APP_LOG(APP_LOG_LEVEL_DEBUG, "New message! ");

+  APP_LOG(APP_LOG_LEVEL_INFO, "New message! ");

   size = dict_size(iter);

@@ -138,7 +139,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     //Pebblekit JS is ready ! Safe to send messages

     s_js_ready = true;

     comm_is_ready();

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "received jsready message on watch... ");

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "received jsready message on watch... ");

   }

   // Read latitude returns

@@ -150,7 +151,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_latitude);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "latitude message received : %s",s_latitude);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "latitude message received : %s",s_latitude);

   }else{

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

   }

@@ -164,7 +165,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_longitude);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "longitude message received : %s",s_longitude);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "longitude message received : %s",s_longitude);

   }else{

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

   }

@@ -178,7 +179,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_accuracy);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "accuracy message received : %s",s_accuracy);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "accuracy message received : %s",s_accuracy);

   }else{

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

   }

@@ -192,7 +193,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_altitude);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "altitude message received : %s",altitude_tuple->value->cstring);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "altitude message received : %s",altitude_tuple->value->cstring);

   }else{

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

   }

@@ -206,7 +207,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_altitude_accuracy);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "altitude_accuracy message received : %s",s_altitude_accuracy);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "altitude_accuracy message received : %s",s_altitude_accuracy);

   }else{

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

   }

@@ -220,7 +221,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_timestamp);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "timestamp message received : %s",s_timestamp);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "timestamp message received : %s",s_timestamp);

   }else{

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

   }

@@ -235,7 +236,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     //uint i_speed=atoi(s_speed);

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_speed);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "speed message received : %s ",s_speed);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "speed message received : %s ",s_speed);

   }else{

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

   }

@@ -249,7 +250,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     //uint i_max_speed=atoi(s_max_speed);

     // Display in the TextLayer

     //text_layer_set_text(s_max_speed_text_layer, lf_max_speed);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "max_speed message received : %s ",s_max_speed);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "max_speed message received : %s ",s_max_speed);

   }else{

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

   }

@@ -261,31 +262,29 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

   if(status_tuple) {

     memset(s_status,'\0',sizeof(s_status));

     strncpy(s_status, status_tuple->value->cstring, 4);

-    /*if (strcmp(s_status,"KO")== 0){

-      //find a way to exit 

-    }else{*/

-      APP_LOG(APP_LOG_LEVEL_DEBUG, "status message received : %s",s_status);

-

-      // DEBUG concatenate all data received

-      memset(s_msg,'\0',sizeof(s_msg));

-      strncpy(s_msg, "Acc. ",5);

-      strcat(s_msg, s_accuracy);

-      strcat(s_msg, "    Alt. ");

-      strcat(s_msg, s_altitude);

-      strcat(s_msg, "\n Max. ");

-      strcat(s_msg, s_max_speed);

-      //strcat(s_msg, "\n Lat. ");

-      //strcat(s_msg, s_latitude);

-      //strcat(s_msg, "\n Long. ");

-      //strcat(s_msg, s_longitude);

-      //strcat(s_msg, "\n Time. ");

-      //strcat(s_msg, s_timestamp);

-

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

-

-      text_layer_set_text(s_speed_text_layer, s_speed);

-      text_layer_set_text(s_other_text_layer, s_msg);

-   // }

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "status message received : %s",s_status);

+

+    // DEBUG concatenate all data received

+    /*

+    memset(s_msg,'\0',sizeof(s_msg));

+    strncpy(s_msg, "Acc. ",5);

+    strcat(s_msg, s_accuracy);

+    strcat(s_msg, "    Alt. ");

+    strcat(s_msg, s_altitude);

+    strcat(s_msg, "\n Max. ");

+    strcat(s_msg, s_max_speed);

+    strcat(s_msg, "\n Lat. ");

+    strcat(s_msg, s_latitude);

+    strcat(s_msg, "\n Long. ");

+    strcat(s_msg, s_longitude);

+    strcat(s_msg, "\n Time. ");

+    strcat(s_msg, s_timestamp);

+    */

+

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

+

+    text_layer_set_text(s_speed_text_layer, s_speed);

+    text_layer_set_text(s_other_text_layer, s_msg);

   }else{

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

   }

@@ -340,7 +339,7 @@ static void prv_deinit(void) {

 int main(void) {

   prv_init();

-  APP_LOG(APP_LOG_LEVEL_DEBUG, "Done initializing, pushed window: %p", s_window);

+  //APP_LOG(APP_LOG_LEVEL_DEBUG, "Done initializing, pushed window: %p", s_window);

   app_event_loop();

   prv_deinit();

@@ -1,8 +1,6 @@

-module.exports = [

-    {

+module.exports = [{

         "type": "section",

-        "items": [

-            {

+        "items": [{

                 "type": "heading",

                 "defaultValue": "Locate Me"

             },

@@ -14,27 +12,13 @@ module.exports = [

             {

                 "type": "input",

                 "messageKey": "ping_location_url",

-                "label": "full URL (https://domain/path/endpoint.php) of server getting the location"

-            },

-            {

-                "type": "input",

-                "messageKey": "ping_location_login",

-                "label": "Login (unused)"

-            },

-            {

-                "type": "input",

-                "messageKey": "ping_location_password",

-                "label": "Password (unused)",

-                "attributes": {

-                    "type": "password"

-                }

+                "label": "Full URL of server getting the location (https://domain/path/endpoint.php)"

             }

         ]

     },

     {

         "type": "section",

-        "items": [

-            {

+        "items": [{

                 "type": "heading",

                 "defaultValue": "strava"

             },

@@ -45,19 +29,13 @@ module.exports = [

             },

             {

                 "type": "text",

-                "defaultValue": "Grant this application access to upload to Strava<br/><a onclick='return confirm(&quot;Have you saved your changes? They would be lost if you continue.&quot;)' href='https://www.strava.com/oauth/authorize?client_id=94880&response_type=code&redirect_uri=http://strava.jonget.fr&approval_prompt=force&state=bike_companion&scope=activity:write'><img src='data:image/png;base64,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'/></a>"

-            },

-            {

-                "type": "toggle",

-                "messageKey": "strava_automatic_upload",

-                "label": "Automatic upload at the end of the track"

+                "defaultValue": "Grant this application access to upload to Strava<br/><i>(unsaved config will be lost)</i><br/><a href='https://www.strava.com/oauth/authorize?client_id=94880&response_type=code&redirect_uri=http://strava.jonget.fr&approval_prompt=force&state=bike_companion&scope=activity:write'><img src='data:image/png;base64,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'/></a>"

             }

         ]

     },

     {

         "type": "section",

-        "items": [

-            {

+        "items": [{

                 "type": "heading",

                 "defaultValue": "Send GPX to another server"

             },

@@ -69,28 +47,10 @@ module.exports = [

             {

                 "type": "input",

                 "messageKey": "gpx_web_url",

-                "label": "full URL (https://domain/path/endpoint.php) of server getting the GPX"

-            },

-            {

-                "type": "input",

-                "messageKey": "gpx_web_login",

-                "label": "Login (unused)"

-            },

-            {

-                "type": "input",

-                "messageKey": "gpx_web_password",

-                "label": "Password (unused)",

-                "attributes": {

-                    "type": "password"

-                }

+                "label": "Full URL of server receiving the GPX (https://domain/path/endpoint.php)"

             }

         ]

     },

-    {

-        "type": "toggle",

-        "messageKey": "debug",

-        "label": "Debug"

-    },

     {

         "type": "submit",

         "id": "submitButton",

@@ -16,156 +16,126 @@ var client_id = "94880";

 var client_secret = "08dc170f0fe38f39dd327bea82a28db4400e6f00";

 var firstlocationOptions = {

-  'enableHighAccuracy': true, // default = false (quick and dirty mode), can be true (more accurate but need more power and time)

-  'timeout': 60000, //60s timeout to get a first good signal

-  'maximumAge': 0 // no cache

+    'enableHighAccuracy': true, // default = false (quick and dirty mode), can be true (more accurate but need more power and time)

+    'timeout': 60000, //60s timeout to get a first good signal

+    'maximumAge': 0 // no cache

 };

 var locationOptions = {

-  'enableHighAccuracy': true, // default = false (quick and dirty mode), can be true (more accurate but need more power and time)

-  'timeout': 5000, //5s timeout to get a good signal

-  'maximumAge': 0 // no cache

+    'enableHighAccuracy': true, // default = false (quick and dirty mode), can be true (more accurate but need more power and time)

+    'timeout': 5000, //5s timeout to get a good signal

+    'maximumAge': 0 // no cache

 };

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

-  clay.config = clayConfig;

-  console.log("Clay config is showing...")

-  Pebble.openURL(clay.generateUrl());

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

+    clay.config = clayConfig;

+    console.log("Clay config is showing...")

+    Pebble.openURL(clay.generateUrl());

 });

-Pebble.addEventListener('webviewclosed', function (t) {

-  if (!t || t.response) {

-    console.log("Clay config is submitted : " + t.response)

-    try {

-      if (data = JSON.parse(t.response), data.code && data.scope == "read,activity:write") {

-        // data looks like this :

-        // {"code":"db896b06f89804997a8088320fba755e6299c0d6","scope":"read,activity:write","state":"bike_companion"}

-        // so need to parse it correctly

-        //var grantcode = JSON.parse(data.strava.value)

-        if (data.state == "bike_companion" && data.scope == "read,activity:write") {

-          getTokens(data.code);

-        } else {

-          console.log("Error on response returned : scope is " + grantcode.scope + " and state is " + grantcode.state);

+Pebble.addEventListener('webviewclosed', function(t) {

+    if (!t || t.response) {

+        console.log("Clay config is submitted : " + t.response)

+        try {

+            if (data = JSON.parse(t.response), data.code && data.scope == "read,activity:write") {

+                if (data.state == "bike_companion" && data.scope == "read,activity:write") {

+                    getTokens(data.code);

+                } else {

+                    console.log("Error on response returned : scope is " + grantcode.scope + " and state is " + grantcode.state);

+                }

+            } else {

+                clay.getSettings(t.response);

+                console.log("Clay settings in Localstorage looks like " + localStorage.getItem("clay-settings"));

+            }

+        } catch (t) {

+            console.log("Oauth parsing error, continue on saving clay settings");

+            clay.getSettings(t.response);

+            var claysettings = JSON.parse(localStorage.getItem('clay-settings'))

+            claysettings.strava_enabled = false;

+            localStorage.setItem("clay-settings", JSON.stringify("claysettings"));

+            console.log("Clay settings in Localstorage looks like " + localStorage.getItem("clay-settings"));

         }

-      } else {

-        clay.getSettings(t.response);

-        console.log("Clay settings in Localstorage looks like " + localStorage.getItem("clay-settings"));

-      }

-    } catch (t) {

-      console.log("Oauth parsing error, continue on saving clay settings");

-      clay.getSettings(t.response);

-      console.log("Clay settings in Localstorage looks like " + localStorage.getItem("clay-settings"));

-      //set strava to false

-    }

-    // dict is not used as intended to send settings to watch

-

-    /* assess if needed to send setting to watch as already in phone (done with "getsettings")

-    m.live_mmt_enable = dict[p.live_mmt_enable]

-    m.live_mmt_login = dict[p.live_mmt_login]

-    m.live_mmt_password = dict[p.live_mmt_password]

-    m.live_jayps_enable = dict[p.live_jayps_enable]

-    m.live_jayps_login = dict[p.live_jayps_login]

-    m.live_jayps_password = dict[p.live_jayps_password]

-    m.strava_automatic_upload = dict[p.strava_automatic_upload]

-

-    i = dict[p.debug]

-    console.log("debug:" + i)

-    g.setDebug(i)

-    h.setDebug(i)

-    b.setDebug(i)

-    y.setDebug(i)

-    m.setDebug(i)

-

-    m.save()

-    // Assess if needed to send settings values to watch side

-    /*

-    Pebble.sendAppMessage(dict, function(e) {

-        console.log('Sent config data to Pebble');

-    }, function(e) {

-        console.log('Failed to send config data!');

-        console.log(JSON.stringify(e));

-    });*/

-  }

+    }

 });

 // Store location in Pebble app local storage

 //

 function storeLocation(position) {

-  var latitude = position.coords.latitude;

-  var longitude = position.coords.longitude;

-  var timestamp = position.timestamp;

-  localStorage.setItem("latitude", latitude);

-  localStorage.setItem("longitude", longitude);

-  localStorage.setItem("timestamp", timestamp);

-  // console.log("Stored location " + position.coords.latitude + ',' + position.coords.longitude);

+    var latitude = position.coords.latitude;

+    var longitude = position.coords.longitude;

+    var timestamp = position.timestamp;

+    localStorage.setItem("latitude", latitude);

+    localStorage.setItem("longitude", longitude);

+    localStorage.setItem("timestamp", timestamp);

+    // console.log("Stored location " + position.coords.latitude + ',' + position.coords.longitude);

 }

 // Get location from Pebble app local storage

 //

 function getLocation() {

-  if (localStorage.getItem("latitude") || localStorage.getItem("longitude") || localStorage.getItem("timestamp")) {

-    var la = localStorage.getItem("latitude");

-    var lo = localStorage.getItem("longitude");

-    var ti = localStorage.getItem("timestamp");

-    var co = { "latitude": la, "longitude": lo };

-    var pos = { "coords": co, "timestamp": ti };

-    // console.log("Stored location " + pos.co.la + ',' + pos.co.lo);

-    return pos;

-  } else {

-    return null;

-  }

+    if (localStorage.getItem("latitude") || localStorage.getItem("longitude") || localStorage.getItem("timestamp")) {

+        var la = localStorage.getItem("latitude");

+        var lo = localStorage.getItem("longitude");

+        var ti = localStorage.getItem("timestamp");

+        var co = { "latitude": la, "longitude": lo };

+        var pos = { "coords": co, "timestamp": ti };

+        // console.log("Stored location " + pos.co.la + ',' + pos.co.lo);

+        return pos;

+    } else {

+        return null;

+    }

 }

 // Get max speed of the run

 //

 function getMaxSpeed(lastSpeed) {

-  oldmax = localStorage.getItem("maxSpeed") || -1;

-  if (oldmax < lastSpeed) {

-    maxSpeed = lastSpeed

-  } else if (oldmax > lastSpeed) {

-    maxSpeed = oldmax

-  } else {

-    maxSpeed = oldmax

-  }

-  localStorage.setItem("maxSpeed", maxSpeed);

-  return maxSpeed

+    oldmax = localStorage.getItem("maxSpeed") || -1;

+    if (oldmax < lastSpeed) {

+        maxSpeed = lastSpeed

+    } else if (oldmax > lastSpeed) {

+        maxSpeed = oldmax

+    } else {

+        maxSpeed = oldmax

+    }

+    localStorage.setItem("maxSpeed", maxSpeed);

+    return maxSpeed

 }

 // split float number into an array of int (null returned instead of 0 for decimal)

 //

 function splitFloatNumber(num) {

-  const intStr = num.toString().split('.')[0];

-  const decimalStr = num.toString().split('.')[1];

-  return [Number(intStr), Number(decimalStr)];

+    const intStr = num.toString().split('.')[0];

+    const decimalStr = num.toString().split('.')[1];

+    return [Number(intStr), Number(decimalStr)];

 }

 // Build GPX headers

 //

 function GPXHeadersBuilder(timestamp, name, type) {

-  var headers = '<?xml version="1.0" encoding="UTF-8"?><gpx creator="Pebble with barometer" 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>';

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

-  return true;

+    var headers = '<?xml version="1.0" encoding="UTF-8"?><gpx creator="Pebble with barometer" 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>';

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

+    return true;

 }

 // Build GPX track point

 //

 function GPXtrkptBuilder(lat, lon, ele, timestamp) {

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

-  var trkpt = '<trkpt lat="' + lat + '" lon="' + lon + '"><ele>' + ele + '</ele><time>' + timestamp + '</time></trkpt>';

-  localStorage.setItem("GPX", GPX + trkpt);

-  return true;

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

+    var trkpt = '<trkpt lat="' + lat + '" lon="' + lon + '"><ele>' + ele + '</ele><time>' + timestamp + '</time></trkpt>';

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

+    return true;

 }

 // 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 : " + GPX + footer);

+    return ret;

 }

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

@@ -173,402 +143,397 @@ function GPXfooterBuilder() {

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

 function getTokens(code) {

-  // call to strava api to get tokens in exchange of temp code

-  // need to use strava.jonget.fr to proxy request and hide secret

-  var url = "https://www.strava.com/oauth/token?client_id=" + client_id + "&client_secret=" + client_secret + "&code=" + code + "&grant_type=authorization_code";

-  var xhr = new XMLHttpRequest();

-  xhr.timeout = 10000; // time in milliseconds

-

-  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

-      };

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

+    // call to strava api to get tokens in exchange of temp code

+    // need to use strava.jonget.fr to proxy request and hide secret

+    var url = "https://www.strava.com/oauth/token?client_id=" + client_id + "&client_secret=" + client_secret + "&code=" + code + "&grant_type=authorization_code";

+    var xhr = new XMLHttpRequest();

+    xhr.timeout = 10000; // time in milliseconds

+

+    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

+            };

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

-    }

-  };

+        }

+    };

-  xhr.send();

+    xhr.send();

 }

 function refreshTokens(refresh_token) {

-  // call to strava api to get tokens in exchange of refresh code

-  // need to use strava.jonget.fr to proxy request and hide secret

-  var url = "https://www.strava.com/oauth/token?client_id=" + client_id + "&client_secret=" + client_secret + "&refresh_token=" + refresh_token + "&grant_type=refresh_token";

-  var xhr = new XMLHttpRequest();

-  xhr.timeout = 10000; // time in milliseconds

-

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

-

-  xhr.onload = function () {

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

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

-      //console.log('------xhr request returned with ' + xhr.status);

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

-

-      var tokenjson = {

-        access_token: response_json.access_token,

-        refresh_token: response_json.refresh_token,

-        expiry: response_json.expires_at

-      };

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

+    // call to strava api to get tokens in exchange of refresh code

+    // need to use strava.jonget.fr to proxy request and hide secret

+    var url = "https://www.strava.com/oauth/token?client_id=" + client_id + "&client_secret=" + client_secret + "&refresh_token=" + refresh_token + "&grant_type=refresh_token";

+    var xhr = new XMLHttpRequest();

+    xhr.timeout = 10000; // time in milliseconds

+

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

+

+    xhr.onload = function() {

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

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

+            //console.log('------xhr request returned with ' + xhr.status);

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

+

+            var tokenjson = {

+                access_token: response_json.access_token,

+                refresh_token: response_json.refresh_token,

+                expiry: response_json.expires_at

+            };

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

-    }

-  };

+        }

+    };

-  xhr.send();

+    xhr.send();

 }

 // Send GPX to Strava profile

 function SendToStrava() {

-  console.log('--- GPX upload to strava');

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

-

-  var tokens = localStorage.getItem("strava_tokens");

-

-  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 = "";

-      // what is 'r'

-      // what is 'e'

-      // what is 'o'

-      // what is 'z'

-      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.", o.setAccessToken("");

-      } else {

+    console.log('--- GPX upload to strava');

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

+

+    var tokens = localStorage.getItem("strava_tokens");

+

+    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 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 {

-          response_json = JSON.parse(e.txt)

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

+            4 == XHR.readyState && (n.status = XHR.status, n.txt = XHR.responseText, n.xml = XHR.responseXML, params.callback && params.callback(n))

         } catch (e) {

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

+            console.error("Error2 loading, ", e)

         }

-      }

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

     }

-  }

-  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 () {

-    // what is 'n'

-    try {

-      4 == XHR.readyState && (n.status = XHR.status, n.txt = XHR.responseText, n.xml = XHR.responseXML, params.callback && params.callback(n))

-    } catch (e) {

-      console.error("Error2 loading, ", e)

-    }

-  }

-  XHR.send(body)

+    XHR.send(body)

 }

 // Send GPX to web server (need configuration on serverside)

 // TODO : secure it ?

 function PostToWeb() {

-  console.log('--- GPX upload to custom web server');

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

-  var url = JSON.parse(localStorage.getItem('clay-settings')).gpx_web_url + "?name=pebblegpx&type=application/gpx+xml";

-  var xhr = new XMLHttpRequest();

-  xhr.timeout = 10000; // time in milliseconds

-

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

-

-  //console.log('------ CSV / xhr opened')

-  xhr.onload = function () {

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

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

-      //console.log('------xhr request returned with ' + xhr.status);

-      //console.log(this.responseText);

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

-      if (xhr.status == 200) {

-        //console.log('--> HTTP 200');

-        return true;

-      } else {

-        //console.log('--> HTTP ' + xhr.status);

-        return false;

-      }

-    }

-  };

+    console.log('--- GPX upload to custom web server');

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

+    var url = JSON.parse(localStorage.getItem('clay-settings')).gpx_web_url + "?name=pebblegpx&type=application/gpx+xml";

+    var xhr = new XMLHttpRequest();

+    xhr.timeout = 10000; // time in milliseconds

+

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

+

+    //console.log('------ CSV / xhr opened')

+    xhr.onload = function() {

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

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

+            //console.log('------xhr request returned with ' + xhr.status);

+            //console.log(this.responseText);

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

+            if (xhr.status == 200) {

+                //console.log('--> HTTP 200');

+                return true;

+            } else {

+                //console.log('--> HTTP ' + xhr.status);

+                return false;

+            }

+        }

+    };

-  //send CSV in body

-  xhr.send(GPX);

+    //send CSV in body

+    xhr.send(GPX);

 }

 // Send location to web server for instant location (no live tracking)

 // TODO : secure it ?

 function instantLocationUpdate(pos) {

-  console.log('--- Instant location update');

-  // console.log(" location is " + new_pos.coords.latitude + ',' + new_pos.coords.longitude + ' , acc. ' + new_pos.coords.accuracy);

-

-  var url = JSON.parse(localStorage.getItem('clay-settings')).ping_location_url + "?lat=" + pos.coords.latitude + "&long=" + pos.coords.longitude + "&acc=" + pos.coords.accuracy + "&timestamp=" + pos.timestamp;

-  var xhr = new XMLHttpRequest();

-  xhr.timeout = 10000; // time in milliseconds

-

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

-

-  //console.log('------ instant / xhr opened')

-  xhr.onload = function () {

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

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

-      //console.log('------xhr request returned with ' + xhr.status);

-      //console.log(this.responseText);

-      if (xhr.status == 200) {

-        //console.log('--> HTTP 200');

-        return true;

-      } else {

-        //console.log('--> HTTP ' + xhr.status);

-        return false;

-      }

-    }

-  };

+    console.log('--- Instant location update');

+    // console.log(" location is " + new_pos.coords.latitude + ',' + new_pos.coords.longitude + ' , acc. ' + new_pos.coords.accuracy);

+

+    var url = JSON.parse(localStorage.getItem('clay-settings')).ping_location_url + "?lat=" + pos.coords.latitude + "&long=" + pos.coords.longitude + "&acc=" + pos.coords.accuracy + "&timestamp=" + pos.timestamp;

+    var xhr = new XMLHttpRequest();

+    xhr.timeout = 10000; // time in milliseconds

+

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

+

+    //console.log('------ instant / xhr opened')

+    xhr.onload = function() {

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

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

+            //console.log('------xhr request returned with ' + xhr.status);

+            //console.log(this.responseText);

+            if (xhr.status == 200) {

+                //console.log('--> HTTP 200');

+                return true;

+            } else {

+                //console.log('--> HTTP ' + xhr.status);

+                return false;

+            }

+        }

+    };

-  //send without body

-  xhr.send();

+    //send without body

+    xhr.send();

 }

 // called in case of successful geoloc gathering and sends the coordinate to watch

 //

 function locationSuccess(new_pos) {

-  console.log('--- locationSuccess');

-  // console.log(" location is " + new_pos.coords.latitude + ',' + new_pos.coords.longitude + ' , acc. ' + new_pos.coords.accuracy);

+    console.log('--- locationSuccess');

+    // console.log(" location is " + new_pos.coords.latitude + ',' + new_pos.coords.longitude + ' , acc. ' + new_pos.coords.accuracy);

-  var prev_pos = getLocation();

-  storeLocation(new_pos);

-  if (prev_pos === null) {

-    console.log('--- start building gpx');

+    var prev_pos = getLocation();

+    storeLocation(new_pos);

+    if (prev_pos === null) {

+        console.log('--- start building gpx');

-    // Start the GPX file

-    GPXHeadersBuilder(new Date(new_pos.timestamp).toISOString(), "test", "18");

+        // Start the GPX file

+        GPXHeadersBuilder(new Date(new_pos.timestamp).toISOString(), "test", "18");

-  } else {

-    //clear watch of new position to avoid overlap

-    //navigator.geolocation.clearWatch(geoloc_id);

-    //console.log('--- watch geoloc cleared');

-    //var speed = speed_from_distance_and_time(prev_pos, new_pos);

-

-    //get speed from geoloc API isntead of calculate it

-    // speed is initially in m/s, get it at km/h

-    if (new_pos.coords.speed === null) {

-      var speed = 0;

     } else {

-      var speed = new_pos.coords.speed * 3.6;

-    }

+        //clear watch of new position to avoid overlap

+        //navigator.geolocation.clearWatch(geoloc_id);

+        //console.log('--- watch geoloc cleared');

+        //var speed = speed_from_distance_and_time(prev_pos, new_pos);

+