Skip to content

Commit

Permalink
v2.2.3 - Hotfix: Daily Auto Login
Browse files Browse the repository at this point in the history 
HOTFIX
- Fixed the Daily Auto Login task to work again.
- Fixed a small bug in the Task-Installer.
   Sorry for the inconvenience!

ADD / EDIT ACCOUNT
- Performance improvements by adding / editing accounts.
- Added a loading UI.
  • Loading branch information
@MaikEight
MaikEight committed Sep 5, 2021
1 parent 93130b0 commit 9ec92ed
Show file tree
Hide file tree
Showing 230 changed files with 1,846 additions and 542 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
_Releases/
bin/
StringToBase64/
Binary file modified .vs/EAM/DesignTimeBuild/.dtbcache.v2
View file
Binary file not shown.
Binary file modified .vs/EAM/v16/.suo
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions EAM Daily Login Service/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,31 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Bunifu.UI.WinForms.BunifuTransition" publicKeyToken="e8e24ccd28363fe9" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.9.0" newVersion="5.0.9.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Bunifu.UI.WinForms.BunifuPictureBox" publicKeyToken="e8e24ccd28363fe9" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.9.0" newVersion="5.0.9.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Bunifu.UI.WinForms.BunifuScrollBar" publicKeyToken="e8e24ccd28363fe9" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.9.0" newVersion="5.0.9.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Bunifu.UI.WinForms.BunifuShadowPanel" publicKeyToken="e8e24ccd28363fe9" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.9.0" newVersion="5.0.9.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Bunifu.UI.WinForms.BunifuDataGridView" publicKeyToken="e8e24ccd28363fe9" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.9.0" newVersion="5.0.9.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Bunifu.UI.WinForms.BunifuButton" publicKeyToken="e8e24ccd28363fe9" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.9.0" newVersion="5.0.9.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Bunifu.UI.WinForms.BunifuToggleSwitch" publicKeyToken="e8e24ccd28363fe9" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.9.0" newVersion="5.0.9.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Bunifu.UI.WinForms.BunifuSeparator" publicKeyToken="e8e24ccd28363fe9" culture="neutral" />
Expand Down
50 changes: 35 additions & 15 deletions EAM Daily Login Service/DailyLogin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,16 +433,21 @@ private static void SaveAccounts()
{
try
{
AesCryptographyService acs = new AesCryptographyService();
byte[] obj = ObjectToByteArray(accounts);
byte[] data = acs.Encrypt(obj);

File.WriteAllBytes(accountsPath, data);
LogEvent(new LogData(0, "EAM Service", LogEventType.SaveAccounts, $"Saving accounts."));
AccountSaveFile saveFile = AccountSaveFile.Encrypt(new AccountSaveFile(), ObjectToByteArray(accounts));
if (saveFile != null && string.IsNullOrEmpty(saveFile.error))
{
File.WriteAllBytes(accountsPath, ObjectToByteArray(saveFile));
LogEvent(new LogData(0, "EAM Service", LogEventType.SaveAccounts, $"Saving accounts."));
}
else
{
LogEvent(new LogData(0, "EAM Service", LogEventType.ServiceError, $"Failed to encrypt accounts!"));
throw new Exception();
}
}
catch
{
LogEvent(new LogData(0, "EAM Service", LogEventType.ServiceError, $"Failed to save accounts!"));
LogEvent(new LogData(0, "EAM Service", LogEventType.ServiceError, $"Failed to save accounts!"));
}
}

Expand Down Expand Up @@ -490,15 +495,30 @@ private static void LoadAccounts()
{
try
{
byte[] data = File.ReadAllBytes(accountsPath);
AesCryptographyService acs = new AesCryptographyService();
accounts = (List<AccountInfo>)ByteArrayToObject(acs.Decrypt(data));
}
catch (Exception ex)
{
Log(ex.Message);
LogEvent(new LogData(0, "EAM Service", LogEventType.ServiceError, $"{ex.Message}"));

try
{
AccountSaveFile saveFile = (AccountSaveFile)ByteArrayToObject(File.ReadAllBytes(accountsPath));
accounts = AccountSaveFile.Decrypt(saveFile);
}
catch
{
LogEvent(new LogData(0, "EAM Service", LogEventType.ServiceError, $"Failed to decrypt accounts."));
}
}
catch (Exception e) { string ex = e.Message; }

//try
//{
// byte[] data = File.ReadAllBytes(accountsPath);
// AesCryptographyService acs = new AesCryptographyService();
// accounts = (List<AccountInfo>)ByteArrayToObject(acs.Decrypt(data));
//}
//catch (Exception ex)
//{
// Log(ex.Message);
// LogEvent(new LogData(0, "EAM Service", LogEventType.ServiceError, $"{ex.Message}"));
//}
}
}

Expand Down
Binary file modified EAM Daily Login Service/obj/Debug/EAM Daily Login Service.csproj.AssemblyReference.cache
View file
Binary file not shown.
29 changes: 15 additions & 14 deletions EAM Daily Login Service/obj/Debug/EAM Daily Login Service.csproj.FileListAbsolute.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,15 @@ C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\De
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csproj.CopyComplete
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.exe
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Statistics.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.1.5.3.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuTransition.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuPictureBox.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuScrollBar.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuShadowPanel.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_RadarChart.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuDataGridView.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuButton.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuToggleSwitch.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.Licensing.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Statistics.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Statistics.dll.config
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.1.5.3.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuTransition.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuPictureBox.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuScrollBar.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuShadowPanel.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_RadarChart.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuDataGridView.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuButton.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuToggleSwitch.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Statistics.exe.config
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuCheckBox.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuCheckBox.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Debug\EAM Daily Login Service.csproj.AssemblyReference.cache
Expand Down Expand Up @@ -103,3 +89,18 @@ C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debu
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuPages.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuCircleProgress.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Newtonsoft.Json.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Statistics.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.1.5.3.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuShadowPanel.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_RadarChart.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuDataGridView.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuButton.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Statistics.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\EAM Statistics.dll.config
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.1.5.3.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuShadowPanel.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\MK_RadarChart.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuDataGridView.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuButton.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuLoader.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Debug\Bunifu.UI.WinForms.BunifuLoader.xml
Binary file modified EAM Daily Login Service/obj/Debug/EAM Daily Login Service.exe
View file
Binary file not shown.
Binary file modified EAM Daily Login Service/obj/Debug/EAM Daily Login Service.pdb
View file
Binary file not shown.
Empty file removed EAM Daily Login Service/obj/Debug/build.force
View file
Empty file.
Binary file modified EAM Daily Login Service/obj/Release/EAM Daily Login Service.csproj.AssemblyReference.cache
View file
Binary file not shown.
29 changes: 15 additions & 14 deletions EAM Daily Login Service/obj/Release/EAM Daily Login Service.csproj.FileListAbsolute.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,15 @@ C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Re
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.csproj.CopyComplete
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.exe
C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\EAM Statistics.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.1.5.3.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuTransition.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuPictureBox.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuScrollBar.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuShadowPanel.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_RadarChart.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuDataGridView.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuButton.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuToggleSwitch.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.Licensing.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\EAM Statistics.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\EAM Statistics.dll.config
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.1.5.3.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuTransition.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuPictureBox.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuScrollBar.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuShadowPanel.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_RadarChart.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuDataGridView.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuButton.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuToggleSwitch.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\EAM Statistics.exe.config
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuCheckBox.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuCheckBox.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.csproj.AssemblyReference.cache
Expand Down Expand Up @@ -172,3 +158,18 @@ C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Rele
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuPages.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuCircleProgress.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Newtonsoft.Json.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\EAM Statistics.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.1.5.3.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuShadowPanel.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_RadarChart.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuDataGridView.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuButton.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\EAM Statistics.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\EAM Statistics.dll.config
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.1.5.3.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuShadowPanel.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\MK_RadarChart.pdb
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuDataGridView.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuButton.xml
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuLoader.dll
C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.BunifuLoader.xml
Binary file modified EAM Daily Login Service/obj/Release/EAM Daily Login Service.exe
View file
Binary file not shown.
Binary file modified EAM Daily Login Service/obj/Release/EAM Daily Login Service.pdb
View file
Binary file not shown.
Loading

0 comments on commit 9ec92ed

Please sign in to comment.