diff --git a/App.config b/App.config
index 92d30f9f..e9493e11 100644
--- a/App.config
+++ b/App.config
@@ -1,6 +1,22 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EVEData/EveManager.cs b/EVEData/EveManager.cs
index a6a6e3e7..29a680ae 100644
--- a/EVEData/EveManager.cs
+++ b/EVEData/EveManager.cs
@@ -1749,7 +1749,7 @@ private async void StartUpdateIncursionsFromESI()
///
private void StartUpdateCharacterThread()
{
- new Thread(async () =>
+ new Thread(() =>
{
Thread.CurrentThread.IsBackground = true;
@@ -1759,7 +1759,7 @@ private void StartUpdateCharacterThread()
for (int i = 0; i < LocalCharacters.Count; i++)
{
LocalCharacter c = LocalCharacters.ElementAt(i);
- await c.Update();
+ c.Update();
}
Thread.Sleep(2000);
diff --git a/EVEData/LocalCharacter.cs b/EVEData/LocalCharacter.cs
index 1b28e569..3851c54d 100644
--- a/EVEData/LocalCharacter.cs
+++ b/EVEData/LocalCharacter.cs
@@ -242,13 +242,13 @@ public override string ToString()
///
/// Update the Character info
///
- public async Task Update()
+ public void Update()
{
TimeSpan ts = ESIAccessTokenExpiry - DateTime.Now;
if (ts.Minutes < 0)
{
- await RefreshAccessToken();
- await UpdateInfoFromESI();
+ RefreshAccessToken().Wait();
+ UpdateInfoFromESI().Wait();
}
UpdatePositionFromESI();
@@ -370,7 +370,7 @@ private async Task RefreshAccessToken()
SsoToken sst;
AuthorizedCharacterData acd;
sst = await EveManager.Instance.ESIClient.SSO.GetToken(GrantType.RefreshToken, ESIRefreshToken);
- if(sst.RefreshToken == null)
+ if(sst == null || sst.RefreshToken == null)
{
return;
}
@@ -436,7 +436,7 @@ private async Task UpdateInfoFromESI()
esiClient.SetCharacterData(ESIAuthData);
- if (CorporationID == -1 || AllianceID == -1)
+ // if (CorporationID == -1 || AllianceID == -1)
{
ESI.NET.EsiResponse esr = await esiClient.Character.Information((int)ID);
diff --git a/SMT.csproj b/SMT.csproj
index 9639de85..0ff7a32d 100644
--- a/SMT.csproj
+++ b/SMT.csproj
@@ -28,9 +28,10 @@
false
false
true
- 0
+ 1
1.0.0.%2a
false
+ true
true
@@ -48,9 +49,11 @@
pdbonly
true
bin\Release\
- TRACE
+
+
prompt
4
+ false
smt_bomb_icon.ico
@@ -58,13 +61,34 @@
app.manifest
+
+ CAF6EC5F5180F997B5256F4F8D04B2346D508D29
+
+
+ SMT_TemporaryKey.pfx
+
+
+ true
+
+
+ true
+
packages\DotNetKit.Wpf.AutoCompleteComboBox.1.2.0\lib\net45\DotNetKit.Wpf.AutoCompleteComboBox.dll
True
-
- packages\ESI.NET.2.5.5\lib\net471\ESI.NET.dll
+
+ packages\ESI.NET.2.9.8\lib\net471\ESI.NET.dll
+
+
+ packages\Microsoft.Extensions.Configuration.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll
+
+
+ packages\Microsoft.Extensions.Configuration.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll
+
+
+ packages\Microsoft.Extensions.Configuration.Binder.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll
packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
@@ -72,6 +96,9 @@
packages\Microsoft.Extensions.Options.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll
+
+ packages\Microsoft.Extensions.Options.ConfigurationExtensions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll
+
packages\Microsoft.Extensions.Primitives.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll
@@ -351,6 +378,7 @@
Always
+
PreserveNewest
diff --git a/packages.config b/packages.config
index 13405edd..458336c1 100644
--- a/packages.config
+++ b/packages.config
@@ -1,11 +1,15 @@
-
+
+
+
+
+
diff --git a/packages/ESI.NET.2.5.5/.signature.p7s b/packages/ESI.NET.2.5.5/.signature.p7s
deleted file mode 100644
index 50dac336..00000000
Binary files a/packages/ESI.NET.2.5.5/.signature.p7s and /dev/null differ
diff --git a/packages/ESI.NET.2.5.5/ESI.NET.2.5.5.nupkg b/packages/ESI.NET.2.5.5/ESI.NET.2.5.5.nupkg
deleted file mode 100644
index daf51ba1..00000000
Binary files a/packages/ESI.NET.2.5.5/ESI.NET.2.5.5.nupkg and /dev/null differ