Skip to content

SP-2359: Do not crash in constructor if config file cannot be upgrade… #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tombogle merged 5 commits into from
May 9, 2025
Merged

SP-2359: Do not crash in constructor if config file cannot be upgrade… #39

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4482d4
SP-2359: Do not crash in constructor if config file cannot be upgrade…
tombogle May 8, 2025
568d1a2
Update PR.yml to install libssl1.1
tombogle May 9, 2025
dc021ac
Update PR.yml to install .NET 8 SDK
tombogle May 9, 2025
f4edefc
Do not run unit tests on Ubuntu (requires mono)
tombogle May 9, 2025
40fc0f0
Minor unit test code cleanup
tombogle May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 45 additions & 7 deletions src/DesktopAnalytics/Analytics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.Net;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading;
using System.Xml.Linq;
using System.Xml.XPath;
using JetBrains.Annotations;
Expand Down Expand Up @@ -172,9 +173,23 @@ public Analytics(string apiSecret, UserInfo userInfo, Dictionary<string,
if (AnalyticsSettings.Default.NeedUpgrade)
{
//see http://stackoverflow.com/questions/3498561/net-applicationsettingsbase-should-i-call-upgrade-every-time-i-load
AnalyticsSettings.Default.Upgrade();
AnalyticsSettings.Default.NeedUpgrade = false;
AnalyticsSettings.Default.Save();
try
{
AnalyticsSettings.Default.Upgrade();
AnalyticsSettings.Default.NeedUpgrade = false;
TrySaveSettings();
}
catch (ConfigurationErrorsException e)
{
try
{
Console.WriteLine(e);
}
catch
{
Debug.WriteLine(e);
}
}
}

if (IsNullOrEmpty(AnalyticsSettings.Default.IdForAnalytics))
Expand All @@ -195,9 +210,8 @@ public Analytics(string apiSecret, UserInfo userInfo, Dictionary<string,

if (IsNullOrEmpty(AnalyticsSettings.Default.IdForAnalytics))
{

AnalyticsSettings.Default.IdForAnalytics = Guid.NewGuid().ToString();
AnalyticsSettings.Default.Save();
TrySaveSettings();
}

s_locationInfo = new JsonObject();
Expand Down Expand Up @@ -236,7 +250,31 @@ public Analytics(string apiSecret, UserInfo userInfo, Dictionary<string,
// See http://issues.bloomlibrary.org/youtrack/issue/BL-4011.

AnalyticsSettings.Default.LastVersionLaunched = versionNumberWithBuild;
AnalyticsSettings.Default.Save();
TrySaveSettings();
}

private static void TrySaveSettings()
{
int retryCount = 0;
do
{
try
{
AnalyticsSettings.Default.Save();
return;
}
catch (Exception e)
{
try
{
Console.WriteLine(e);
}
catch
{
}
Thread.Sleep(300);
}
} while (++retryCount < 3);
}

private void AttemptToGetUserIdSettingsFromDifferentChannel()
Expand Down Expand Up @@ -309,7 +347,7 @@ private void AttemptToGetUserIdSettingsFromDifferentChannel()
AnalyticsSettings.Default.LastName = ExtractSetting(AnalyticsSettings.Default.LastName, doc, "LastName");
AnalyticsSettings.Default.LastVersionLaunched = ExtractSetting(AnalyticsSettings.Default.LastVersionLaunched, doc, "LastVersionLaunched");
AnalyticsSettings.Default.Email = ExtractSetting(AnalyticsSettings.Default.Email, doc, "Email");
AnalyticsSettings.Default.Save();
TrySaveSettings();
return;
}
catch (Exception)
Expand Down
Loading