Merge branch 'release/v20.1.35'

rowers/dataroutines.py

@@ -1005,6 +1005,7 @@ def parsenonpainsled(fileformat, f2, summary, startdatetime='', empowerfirmware=
             try:
                 row = parsers[fileformat](f2)
             except:
+                hasrecognized = False
                 return None, hasrecognized, '', 'unknown'
         if startdatetime != '':  # pragma: no cover
             row.rowdatetime = arrow.get(startdatetime).datetime

rowers/views/importviews.py

@@ -524,7 +524,12 @@ def rower_process_stravacallback(request):
         r.stravarefreshtoken = refresh_token
 
         r.save()
-        _ = strava_integration.set_strava_athlete_id()
+        try:
+            _ = strava_integration.set_strava_athlete_id()
+        except NoTokenError:
+            messages.error(request,'Something went wrong storing your Strava ID. Please authorize again')
+            url = reverse('rower_exportsettings_view')
+            return HttpResponseRedirect(url)
 
         successmessage = "Tokens stored. Good to go. Please check your import/export settings"
         messages.info(request, successmessage)