new file mode 100644

@@ -0,0 +1,33 @@

+STRAVA_API

+

+{

+  "file": /path/to/file.txt, // {File} The uploaded file.

+  "name": name_example, // {String} The desired name of the resulting activity.

+  "description": description_example, // {String} The desired description of the resulting activity.

+  "trainer": trainer_example, // {String} Whether the resulting activity should be marked as having been performed on a trainer.

+  "commute": commute_example, // {String} Whether the resulting activity should be tagged as a commute.

+  "dataType": dataType_example, // {String} The format of the uploaded file.

+  "externalId": externalId_example // {String} The desired external identifier of the resulting activity.

+}

+

+

+https://resmedglobal.atlassian.net/secure/CreateIssue.jspa?issuetype=2&pid=ISMS2

+https://resmedglobal.atlassian.net/secure/CreateIssue.jspa?issuetype=3&pid=ISMS2

+

+OAuth2.0 strava / pebble

+

+1 - get activity:write authorization (once and for all)

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

+    monitor state, code and scope (as upload can be unchecked)!

+    code is short lived and one time usage

+2 - get tokens in exchange of code

+    POST https://www.strava.com/oauth/token?client_id=94880&client_secret=08dc170f0fe38f39dd327bea82a28db4400e6f00&code=e0aeb60ea9f508d25974bb56ccb551be56b91470&grant_type=authorization_code

+    refresh & access tokens + expiry of access token (6hours) retrieved

+

+3 - test if access token expired

+

+4a- if not, API call

+    GET https://www.strava.com/api/v3/athlete with "Authorization" header ="Bearer XXXXX"  XXXXX=access token

+

+4b- if yes refresh access token with refresh token get in 2

+    POST https://www.strava.com/oauth/token?client_id=94880&client_secret=08dc170f0fe38f39dd327bea82a28db4400e6f00&refresh_token=XXXXXXX&grant_type=refresh_token

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

@@ -65,16 +65,17 @@ static void send_message(char * msg){

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

-  text_layer_set_text(s_other_text_layer, "Select - sending get geoloc");

+  text_layer_set_text(s_speed_text_layer, "");

+  text_layer_set_text(s_other_text_layer, "sending get geoloc");

   send_message("get");

 }

 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, "Up");

 }

 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, "Down");

 }

 static void prv_click_config_provider(void *context) {

@@ -93,7 +94,6 @@ static void prv_window_load(Window *window) {

   text_layer_set_text_color(s_speed_text_layer, GColorWhite);

   text_layer_set_font(s_speed_text_layer, fonts_get_system_font(FONT_KEY_BITHAM_42_BOLD));

   text_layer_set_text_alignment(s_speed_text_layer, GTextAlignmentCenter);

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

   layer_add_child(window_layer, text_layer_get_layer(s_speed_text_layer));

@@ -101,9 +101,8 @@ static void prv_window_load(Window *window) {

   text_layer_set_background_color(s_other_text_layer, GColorClear);

   text_layer_set_text_color(s_other_text_layer, GColorBlack);

-  text_layer_set_font(s_other_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_14));

+  text_layer_set_font(s_other_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

   text_layer_set_text_alignment(s_other_text_layer, GTextAlignmentCenter);

-  text_layer_set_text(s_other_text_layer, "Press a button");

   layer_add_child(window_layer, text_layer_get_layer(s_other_text_layer));

 }

@@ -114,6 +113,7 @@ 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");

 }

@@ -273,7 +273,7 @@ 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_speed_text_layer, strcat(s_speed," km/h"));

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

@@ -8,7 +8,6 @@ var message;

 var gpx_to_strava = false;

 var csv_to_web = true;

-var firstlocationInterval;

 var locationInterval;

 var firstlocationOptions = {

@@ -129,7 +128,7 @@ function GPXHeadersBuilder(timestamp, name, type) {

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

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

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

   return true;

 }

@@ -139,13 +138,14 @@ 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 : " + GPX + footer);

   return ret;

 }

 // Send GPX to Strava profile

 // TODO : get authentication creds from settings

 function SendToStrava() {

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

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

@@ -203,20 +203,21 @@ function CSV(pos) {

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

 // TODO : secure it ?

 function PostToWeb() {

+  console.log('--- CSV upload to web');

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

-  var url = "https://jonget.fr/strava/upload.php?name=pebblecsv&type=gpx/xml";

+  var url = "https://jonget.fr/strava/upload.php?name=pebblecsv&type=application/gpx+xml";

   var xhr = new XMLHttpRequest();

   xhr.timeout = 10000; // time in milliseconds

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

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

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

   xhr.onload = function () {

-    console.log('------xhr onload')

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

     if (xhr.readyState === 4) {

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

-      console.log(this.responseText);

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

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

       if (xhr.status == 200) {

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

         return true;

@@ -235,7 +236,6 @@ function PostToWeb() {

 // Send location to web server for instant location (no 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);

@@ -245,12 +245,12 @@ function instantLocationUpdate(pos) {

   xhr.open("POST", url);

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

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

   xhr.onload = function () {

-    console.log('------xhr onload')

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

     if (xhr.readyState === 4) {

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

-      console.log(this.responseText);

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

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

       if (xhr.status == 200) {

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

         return true;

@@ -343,12 +343,12 @@ function locationSuccess(new_pos) {

     if (gpx_to_strava) {

       //add a new datapoint to GPX file

       GPXtrkptBuilder(latitudeString, longitudeString, altitudeString, timestampISO);

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

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

     }

     if (csv_to_web) {

       // Start the csv file

       CSV(new_pos);

-      console.log('CSV: ' + localStorage.getItem("CSV"));

+      //console.log('CSV: ' + localStorage.getItem("CSV"));

     }

@@ -370,13 +370,9 @@ function locationSuccess(new_pos) {

     });

   }

-  // restart the watch

-  //geoloc_id = navigator.geolocation.watchPosition(locationSuccess, locationError, locationOptions);

 }

 function locationError(err) {

-  //clear watch of new position to avoid overlap

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

   console.warn('location error (' + err.code + '): ' + err.message);

   if (csv_to_web) {

@@ -387,8 +383,6 @@ function locationError(err) {

     localStorage.setItem("CSV", CSV + datapoint);

   }

-  // restart the watch

-  //geoloc_id = navigator.geolocation.watchPosition(locationSuccess, locationError, locationOptions);

 }

@@ -399,7 +393,7 @@ function get_coordinate() {

   locationInterval = setInterval(function () {

     navigator.geolocation.getCurrentPosition(locationSuccess, locationError, locationOptions);

-  }, 5000);

+  }, 1000);

   instantLocationInterval = setInterval(function () {

     navigator.geolocation.getCurrentPosition(instantLocationUpdate, locationError, locationOptions);

@@ -430,7 +424,7 @@ Pebble.addEventListener('ready', function (e) {

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

   // Get the dictionary from the message

   var dict = e.payload;

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

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

   switch (dict[0]) {

     case 'get':

       get_coordinate();

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

         SendToStrava();

       }

       if (csv_to_web) {

-        //CSV(new_pos);

         // send CSV to web server through API

         PostToWeb();

       }