Binary files a/build/bike_companion.pbw and b/build/bike_companion.pbw differ

@@ -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... ");

   }

@@ -10,7 +10,7 @@ var firstlocationInterval = false;

 var locationInterval = false;

 var instantLocationInterval = false;

-// TODO to remove for security

+// TODO to move to C for security

 var client_id = "94880";

 var client_secret = "08dc170f0fe38f39dd327bea82a28db4400e6f00";

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

 // 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 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;

 }

@@ -201,7 +201,7 @@ 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);

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

   return ret;

 }

@@ -289,21 +289,35 @@ function SendToStrava() {

     callback: function (e) {

       var message = "";

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

-        message = "Your activity has been created";

+        message = "S200";

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

+        message = "S400";

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

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

+        //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 (e) {

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

+        } catch (err) {

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

         }

+        message = "S500";

       }

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

+      //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;

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

     }

   };

-  //send CSV in body

+  //send GPX in body

   xhr.send(GPX);

 }

@@ -488,7 +502,7 @@ function locationSuccess(new_pos) {

     // Build message

-    message = "OK";

+    message = "L200";

     var dict = {

       'accuracy': accuracyString,

       'distance': distanceString,

@@ -559,12 +573,14 @@ function init() {

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

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

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

-      console.log("WARNING - NO GPX FOOTER : " + GPX.substring(GPX.length - 6, 6))

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

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

-      GPXfooterBuilder();

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

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

@@ -613,9 +629,9 @@ Pebble.addEventListener('appmessage', function (e) {

         locationInterval = false;

         clearInterval(instantLocationInterval);

         instantLocationInterval = false;

-        firstlocationInterval = setInterval(function () {

+        /*firstlocationInterval = setInterval(function () {

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

-        }, 1000);

+        }, 1000);*/

       } else {

         console.log("Starting the track");

         start_get_coordinate();

@@ -626,20 +642,9 @@ Pebble.addEventListener('appmessage', function (e) {

         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]);