diff --git a/TeslaLogger/Car.cs b/TeslaLogger/Car.cs index a149cd512..2639b0572 100644 --- a/TeslaLogger/Car.cs +++ b/TeslaLogger/Car.cs @@ -413,6 +413,8 @@ private void Loop() break; } + webhelper.CheckRefreshToken(); + } catch (Exception ex) { diff --git a/TeslaLogger/Properties/AssemblyInfo.cs b/TeslaLogger/Properties/AssemblyInfo.cs index bb3384e67..f0c33dd9a 100644 --- a/TeslaLogger/Properties/AssemblyInfo.cs +++ b/TeslaLogger/Properties/AssemblyInfo.cs @@ -32,8 +32,8 @@ // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.62.4.0")] -[assembly: AssemblyFileVersion("1.62.4.0")] +[assembly: AssemblyVersion("1.62.5.0")] +[assembly: AssemblyFileVersion("1.62.5.0")] [assembly: InternalsVisibleTo("UnitTestsTeslaloggerNET8")] [assembly: InternalsVisibleTo("UnitTestsTeslalogger")] \ No newline at end of file diff --git a/TeslaLogger/WebHelper.cs b/TeslaLogger/WebHelper.cs index 439eb008d..e47b6b60a 100644 --- a/TeslaLogger/WebHelper.cs +++ b/TeslaLogger/WebHelper.cs @@ -747,8 +747,14 @@ public string GetRegion() } else { + if (result.Contains("token expired")) + { + car.Log("Token expired"); + UpdateTeslaTokenFromRefreshToken(); + } + car.CreateExeptionlessLog("GetRegion", "Error", LogLevel.Fatal).AddObject((int)response.StatusCode + " / " + response.StatusCode.ToString(), "StatusCode").Submit(); - Log("Error getting Region: " + (int)response.StatusCode + " / " + response.StatusCode.ToString()); + Log("Error getting Region: " + (int)response.StatusCode + " / " + response.StatusCode.ToString() + " result: " + result); return ""; } } @@ -2343,11 +2349,7 @@ public async Task IsOnline(bool returnOnUnauthorized = false) } else { - if (nextTeslaTokenFromRefreshToken < DateTime.UtcNow) - { - nextTeslaTokenFromRefreshToken = DateTime.UtcNow.AddMinutes(5); - UpdateTeslaTokenFromRefreshToken(); - } + CheckRefreshToken(); if (car.FleetAPI) { @@ -2631,6 +2633,15 @@ public async Task IsOnline(bool returnOnUnauthorized = false) return "NULL"; } + internal void CheckRefreshToken() + { + if (nextTeslaTokenFromRefreshToken < DateTime.UtcNow) + { + nextTeslaTokenFromRefreshToken = DateTime.UtcNow.AddMinutes(5); + UpdateTeslaTokenFromRefreshToken(); + } + } + void CheckVehicleConfig() { if (car.FleetAPI) diff --git a/TeslaLogger/bin/TeslaLogger.exe b/TeslaLogger/bin/TeslaLogger.exe index dad30b017..a81327286 100644 Binary files a/TeslaLogger/bin/TeslaLogger.exe and b/TeslaLogger/bin/TeslaLogger.exe differ diff --git a/TeslaLogger/bin/changelog.md b/TeslaLogger/bin/changelog.md index 3176c4e02..c0f20aa44 100644 --- a/TeslaLogger/bin/changelog.md +++ b/TeslaLogger/bin/changelog.md @@ -1,3 +1,9 @@ +# Version 1.62.5 +- Detect Model Y LR RWD +- BF: Split drives +- BF: inactive cars +- BF: faster startup (inactive cars will be checked after active cars) + # Version 1.62.4 - Better support for new Tesla Model S/X 2021