@@ -1,4 +1,4 @@

-STRAVA_API

+/*STRAVA_API

 {

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

@@ -30,4 +30,54 @@ OAuth2.0 strava / pebble

     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

+    POST https://www.strava.com/oauth/token?client_id=94880&client_secret=8a68d5b79f2fb3e00ad3eaa5025253990fbd6a58&refresh_token=c313d612768db4b12af2782372aa1d9349c265cb&grant_type=refresh_token

+*/

+

+gpxfile = b.getGpx(!0) // returned gpxfile is string

+upload(gpxfile)

+

+function getGpx(t) {

+    if (0 == points.length) return "";

+    if (creator = "Ventoo SE", gpxfile = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n<gpx xmlns="http://www.topografix.com/GPX/1/1" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" creator="' + creator + '" version="1.1" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd  http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd" xmlns:pb10="http://www.pebblebike.com/GPX/1/0/">\n', itemId = -1, trackNumber = 1, points.length > 0) {

+        for (gpxfile += "<trk>\n<name>Track #1</name>\n<trkseg>\n", prevTime = -1, i = 0; i < points.length; i++) prevTime > 0 && points[i].t - prevTime > 43200 ? (trackNumber++, gpxfile += "</trkseg>\n</trk>\n<trk>\n<name>Track #" + trackNumber + "</name>\n<trkseg>\n") : prevTime > 0 && points[i].t - prevTime > 7200 && (gpxfile += "</trkseg>\n<trkseg>\n"), d = new Date(1e3 * points[i].t), ti = d.toISOString(), gpxfile += '<trkpt lat="' + points[i].la + '" lon="' + points[i].lo + '">\n  <ele>' + points[i].a + "</ele><time>" + ti + "</time>\n", !t && points[i].h || (gpxfile += "  <extensions>", t && (gpxfile += "<pb10:accuracy>" + points[i].ac + "</pb10:accuracy>"), points[i].h && (gpxfile += "<gpxtpx:TrackPointExtension>", gpxfile += "<gpxtpx:hr>" + points[i].h + "</gpxtpx:hr>", gpxfile += "</gpxtpx:TrackPointExtension>\n"), gpxfile += "</extensions>\n"), gpxfile += "</trkpt>\n", prevTime = points[i].t;

+        gpxfile += "</trkseg>\n</trk>\n"

+    }

+    return gpxfile += "</gpx>\n", gpxfile

+}

+

+function upload(gpxfile) {

+    params = {

+            url: s,

+            method: "POST",

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

+            files: { file: gpxfile },

+            authorization: "Bearer " + c

+            callback: function() {

+                var z = "";

+                if (r && console.log(e.status + " - " + e.txt), 201 == e.status) z = "Your activity has been created";

+                else if (400 == e.status) z = "An error has occurred. If you've already uploaded the current activity, please delete it in Strava.";

+                else if (401 == e.status) z = "Error - Unauthorized. Please check your credentials in the settings.", o.setAccessToken("");

+                else try { response_json = JSON.parse(e.txt), response_json.error ? (r && console.log("error:" + response_json.error), z = response_json.error, o.setAccessToken("")) : response_json.status && (r && console.log("status:" + response_json.status), z = response_json.status) } catch (z) { console.log("Error log, " + z) }

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

+            }

+        }

+        //e[0] = params

+    var XHR = new XMLHttpRequest

+    console.log(e[0].url)

+    XHR.open(e[0].method, e[0].url, !0)

+    var r = Math.random().toString().substr(2);

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

+    e[0].authorization && XHR.setRequestHeader("Authorization", e[0].authorization);

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

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

+    o += "--" + r + "--\r\n"

+

+    XHR.onreadystatechange = function() {

+        try {

+            4 == XHR.readyState && (n.status = XHR.status, n.txt = XHR.responseText, n.xml = XHR.responseXML, e[0].callback && e[0].callback())

+        } catch (t) {

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

+        }

+    }

+    XHR.send(o)

+}

\ No newline at end of file

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

@@ -2,7 +2,9 @@

   "name": "bike_companion",

   "author": "ljonget@gmail.com",

   "version": "1.0.0",

-  "keywords": ["pebble-app"],

+  "keywords": [

+    "pebble-app"

+  ],

   "private": true,

   "dependencies": {

     "pebble-clay": "^1.0.0"

@@ -76,12 +76,19 @@ static void prv_up_click_handler(ClickRecognizerRef recognizer, void *context) {

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

   //text_layer_set_text(s_other_text_layer, "Down");

+  send_message("exit");

+}

+

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

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

+  //send_message("exit");

 }

 static void prv_click_config_provider(void *context) {

   window_single_click_subscribe(BUTTON_ID_SELECT, prv_select_click_handler);

   window_single_click_subscribe(BUTTON_ID_UP, prv_up_click_handler);

   window_single_click_subscribe(BUTTON_ID_DOWN, prv_down_click_handler);

+  window_single_click_subscribe(BUTTON_ID_BACK, prv_back_click_handler);

 }

 static void prv_window_load(Window *window) {

@@ -254,27 +261,31 @@ 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, 2);

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

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

+   // }

   }else{

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

   }

@@ -322,7 +333,6 @@ static void prv_init(void) {

 }

 static void prv_deinit(void) {

-  send_message("exit");

   window_destroy(s_window);

 }

@@ -2,11 +2,12 @@ var Clay = require('pebble-clay');

 var clayConfig = require('./config');

 var clay = new Clay(clayConfig);

+

 var messageKeys = require('message_keys');

 var message;

-var gpx_to_strava = false;

-var gpx_to_web = true;

+var gpx_to_strava = true;

+var gpx_to_web = false;

 var locationInterval;

@@ -50,7 +51,6 @@ function getLocation() {

     }

 }

-

 // Calculate the distance from 2 geoloc in degrees.

 // IMPORTANT : this is a calculation from 2D projection, altitude is not involved

 //

@@ -142,34 +142,60 @@ function GPXfooterBuilder() {

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

+    // need to automate oAUTH

+    var bearer = "8a68d5b79f2fb3e00ad3eaa5025253990fbd6a58"

+    params = {

+        url: s,

+        method: "POST",

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

+        files: { file: gpxfile },

+        authorization: "Bearer " + bearer,

+        callback: function() {

+            var message = "";

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

+                message = "Your activity has been created";

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

+                try {

+                    response_json = JSON.parse(e.txt), response_json.error ? (r && console.log("error:" + response_json.error), message = response_json.error, o.setAccessToken("")) : response_json.status && (r && console.log("status:" + response_json.status), z = response_json.status)

+                } catch (z) {

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

+                }

+            }

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

+        }

+    }

-

-    /* -------------------- */

-    var array = [GPX]; // an array consisting of a single string

-    var blob = new Blob(array, { type: "application/gpx+xml" }); // the blob

-

-    // creating multipart/form-data to be sent

+    // fetch or Blob or Formdata are not implemented in pebblekitJS

+    /*fetch('data:application/gpx+xml;base64,'.btoa(GPX))

+        .then(function(value) { return value.blob() })

+        .then(

+            function(value) {

     var data = new FormData();

-    data.append("file", blob, "blob.gpx");

     data.append("name", "test");

-    data.append("description", "testdesc");

+    data.append("description", "description");

     data.append("data_type", "gpx");

+    data.append("file", value, "blob.gpx");

-    var url = "https://www.strava.com/api/v3/uploads";

     var xhr = new XMLHttpRequest();

+    var url = "https://www.strava.com/api/v3/uploads";

     xhr.withCredentials = true;

     xhr.timeout = 10000; // time in milliseconds

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

-    xhr.setRequestHeader("Authorization", "Bearer d8927033b3996efe1e5a4e62425bc2aff8f635b0");

+    xhr.setRequestHeader("Authorization", "Bearer 8a68d5b79f2fb3e00ad3eaa5025253990fbd6a58");

     console.log('------GPX / xhr opened with authorization')

-    console.log('------array for blob: ' + array)

+    console.log('------array for blob: ' + [GPX])

     xhr.onload = function() {

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

         if (xhr.readyState === 4) {

@@ -185,10 +211,15 @@ function SendToStrava() {

         }

     };

-    // send with data in body

     xhr.send(data);

+    },

+            function(error) {

+                console.log('error')

+            }

+        )*/

     /* -------------------- */

+

 }

@@ -433,6 +464,15 @@ Pebble.addEventListener('appmessage', function(e) {

                     PostToWeb();

                 }

             }

+            // Send the message

+            var dict = {

+                'status': "KO"

+            };

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