@@ -23,10 +23,9 @@ Pebble.addEventListener('showConfiguration',
23
23
function ( e ) {
24
24
// TODO: Add the existing user settings to the url
25
25
// Pebble.openURL('https://thunsaker.github.io/spoon/config'); // Prod
26
-
27
- // Dev
28
- var client_id = 'XVCTS2NLOT3D24JHQBM40MZGWQD1SR5VJMIBXQY2AYQ3WVYC' ;
29
- var callback_uri = 'http%3A%2F%2Fblog.thomashunsaker.com%2Fspoon%2Fcallback.html' ;
26
+
27
+ var client_id = '0KM5OWM4PWMHTEVCDVSWNBPRSXNFLRMODVBP0OGX31JELKR5' ;
28
+ var callback_uri = 'http%3A%2F%2Fthomashunsaker.com%2Fapps%2Fsoup%2Fspoon_callback.html' ;
30
29
if ( client_id && callback_uri ) {
31
30
Pebble . openURL ( 'https://foursquare.com/oauth2/authorize?client_id=' + client_id + '&response_type=token&redirect_uri=' + callback_uri ) ;
32
31
} else {
@@ -36,26 +35,23 @@ Pebble.addEventListener('showConfiguration',
36
35
37
36
Pebble . addEventListener ( 'webviewclosed' ,
38
37
function ( e ) {
39
- var token = JSON . parse ( e . response ) ;
40
- // console.log(token);
41
- if ( token !== null ) {
42
- if ( token . length > 0 ) {
43
- // console.log("Token " + token);
44
- localStorage . foursquare_token = token ;
45
- notifyPebbleConnected ( localStorage . foursquare_token . toString ( ) ) ;
46
- }
38
+ var configuration = JSON . parse ( e . response ) ;
39
+ if ( configuration . result ) {
40
+ localStorage . foursquare_token = configuration . token ;
41
+ notifyPebbleConnected ( localStorage . foursquare_token . toString ( ) ) ;
47
42
isNewList = true ;
48
43
getClosestVenues ( ) ;
49
44
} else {
50
- // Pebble.showSimpleNotificationOnPebble('Spoon', ':( Connection Failed. Try Again.');
45
+ Pebble . showSimpleNotificationOnPebble ( 'Spoon' , ':( Connection Failed. Try Again.' ) ;
51
46
}
52
47
53
48
// if(configuration.theme !== null && configuration.unit !== null) {
54
49
// localStorage.spoon_theme = configuration.theme;
55
50
// localStorage.spoon_unit = configuration.unit; // 0 == km | 1 == mi
56
51
// notifyPebbleConfiguration(configuration.theme);
57
52
// }
58
- } ) ;
53
+ }
54
+ ) ;
59
55
60
56
function notifyPebbleConnected ( token ) {
61
57
// console.log("Sending the token: " + token);
@@ -78,7 +74,8 @@ var error = function(e) {
78
74
} ;
79
75
80
76
var success = function ( position ) {
81
- var userToken = localStorage . foursquare_token . toString ( ) ;
77
+ var userToken = localStorage . foursquare_token !== null ?
78
+ localStorage . foursquare_token . toString ( ) : null ;
82
79
if ( userToken ) {
83
80
fetchMostRecentCheckin ( userToken ) ;
84
81
fetchClosestVenues ( userToken , position ) ;
0 commit comments