Merge branch 'develop' into feature/metrics

rowers/c2stuff.py

@@ -821,7 +821,10 @@ def get_userid(access_token):
         return 0
 
 
-    me_json = response.json()
+    try:
+        me_json = response.json()
+    except JSONDecodeError:
+        return 0
     try:
         res = me_json['data']['id']
     except KeyError:

rowers/uploads.py

@@ -506,6 +506,7 @@ def do_sync(w,options):
     try:
         if options['stravaid'] != 0:
             w.uploadedtostrava = options['stravaid']
+            options['upload_to_Strava'] = False
             w.save()
     except KeyError:
         pass
@@ -524,14 +525,13 @@ def do_sync(w,options):
         if ('upload_to_Strava' in options and not options['upload_to_Strava']):
             pass
         else:
-            if options['stravaid'] != 0:
-                try:
-                    message,id = stravastuff.workout_strava_upload(
-                    w.user.user,w
-                    )
-                except NoTokenError:
-                    id = 0
-                    message = "Please connect to Strava first"
+            try:
+                message,id = stravastuff.workout_strava_upload(
+                w.user.user,w
+                )
+            except NoTokenError:
+                id = 0
+                message = "Please connect to Strava first"
 
 
     if ('upload_to_SportTracks' in options and options['upload_to_SportTracks']) or (w.user.sporttracks_auto_export and isprorower(w.user)):