🔀 Merge pull request #5 from MaikEight/develop

🔀 EAM v3.3.0
MaikEight · Oct 14, 2023 · 2455c47 · 2455c47
2 parents 5933162 + ae4c16a
commit 2455c47
Show file tree

Hide file tree

Showing 27 changed files with 218 additions and 266 deletions.
diff --git a/.gitignore b/.gitignore
@@ -792,3 +792,5 @@ FodyWeavers.xsd
 /.vs/EAM/DesignTimeBuild/.dtbcache.v2
 /EAM Daily Login Service/obj/Debug/EAM Daily Login Service.exe
 /EAM Daily Login Service/obj/Release/EAM Daily Login Service.exe
+/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.pdb
+/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.csproj.FileListAbsolute.txt
diff --git a/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.csproj.FileListAbsolute.txt b/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.csproj.FileListAbsolute.txt
diff --git a/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.pdb b/EAM Daily Login Service/obj/Debug/EAM Daily Login Service.pdb
diff --git a/EAM Daily Login Service/obj/Release/EAM Daily Login Service.csproj.FileListAbsolute.txt b/EAM Daily Login Service/obj/Release/EAM Daily Login Service.csproj.FileListAbsolute.txt
@@ -119,7 +119,6 @@ C:\Users\mkuehne\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Re
 C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Newtonsoft.Json.dll
 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\MK_EAM_Lib.dll.config
-C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\obj\Release\EAM Daily Login Service.csproj.SuggestedBindingRedirects.cache
 C:\Users\Maik8\source\repos\ExaltAccountManager\EAM Daily Login Service\bin\Release\Bunifu.UI.WinForms.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\MK_EAM_General_Services_Lib.dll

diff --git a/EAM Daily Login Service/obj/Release/EAM Daily Login Service.pdb b/EAM Daily Login Service/obj/Release/EAM Daily Login Service.pdb
diff --git a/EAM PingChecker/obj/Debug/eam pingchecker.exe.licenses b/EAM PingChecker/obj/Debug/eam pingchecker.exe.licenses
diff --git a/EAM PingChecker/obj/Release/eam pingchecker.exe.licenses b/EAM PingChecker/obj/Release/eam pingchecker.exe.licenses
diff --git a/EAM Statistics/obj/Debug/eam statistics.exe.licenses b/EAM Statistics/obj/Debug/eam statistics.exe.licenses
diff --git a/EAM Statistics/obj/Release/eam statistics.exe.licenses b/EAM Statistics/obj/Release/eam statistics.exe.licenses
diff --git a/EAM Tasktray Tool/obj/Debug/eam notification center.exe.licenses b/EAM Tasktray Tool/obj/Debug/eam notification center.exe.licenses
diff --git a/EAM Tasktray Tool/obj/Release/eam notification center.exe.licenses b/EAM Tasktray Tool/obj/Release/eam notification center.exe.licenses
diff --git a/EAM Vault Peeker/obj/Debug/eam vault peeker.exe.licenses b/EAM Vault Peeker/obj/Debug/eam vault peeker.exe.licenses
diff --git a/EAM Vault Peeker/obj/Release/eam vault peeker.exe.licenses b/EAM Vault Peeker/obj/Release/eam vault peeker.exe.licenses
diff --git a/EAM_Installer/wix/EAM_Installer.g.wxs b/EAM_Installer/wix/EAM_Installer.g.wxs
diff --git a/ExaltAccountManager/FrmMain.cs b/ExaltAccountManager/FrmMain.cs
@@ -26,7 +26,7 @@ namespace ExaltAccountManager
 {
     public sealed partial class FrmMain : Form
     {
-        public readonly Version version = new Version(3, 2, 1);
+        public readonly Version version = new Version(3, 3, 0);
         public const string GITHUB_PROJECT_URL = "https://github.com/MaikEight/ExaltAccountManager";
         public const string DISCORD_INVITE_URL = "https://discord.exalt-account-manager.eu";
         public string API_BASE_URL { get; internal set; } = "https://api.exalt-account-manager.eu/";
@@ -439,10 +439,33 @@ public FrmMain(string[] args)
                             {
                                 File.WriteAllBytes(optionsPath, ObjectToByteArray(OptionsData));
                             }
-                            catch { }
+                            catch
+                            {
+                                LogEvent(new MK_EAM_Lib.LogData(
+                                    "EAM",
+                                    MK_EAM_Lib.LogEventType.EAMError,
+                                    "Failed to save options."));
+                            }
                         }
                     }
-                    catch { }
+                    catch
+                    {
+                        LogEvent(new MK_EAM_Lib.LogData(
+                            "EAM",
+                            MK_EAM_Lib.LogEventType.EAMError,
+                            "Failed to load options, using a temporary one."));
+                        LogButtonBlink();
+
+                        OptionsData = new OptionsData()
+                        {
+                            exePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), @"RealmOfTheMadGod\Production\RotMG Exalt.exe"),
+                            closeAfterConnection = false,
+                            snackbarPosition = 8,
+                            hideSnackbarOnPlay = false,
+                            discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true },
+                            analyticsOptions = new AnalyticsOptions() { Anonymization = false, OptOut = false },
+                        };
+                    }
                 }
                 else
                 {
@@ -453,12 +476,20 @@ public FrmMain(string[] args)
                             exePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), @"RealmOfTheMadGod\Production\RotMG Exalt.exe"),
                             closeAfterConnection = false,
                             snackbarPosition = 8,
+                            hideSnackbarOnPlay = false,
                             discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true },
                             analyticsOptions = new AnalyticsOptions() { Anonymization = false, OptOut = false },
                         };
                         File.WriteAllBytes(optionsPath, ObjectToByteArray(OptionsData));
                     }
-                    catch { }
+                    catch
+                    {
+                        LogEvent(new MK_EAM_Lib.LogData(
+                            "EAM",
+                            MK_EAM_Lib.LogEventType.EAMError,
+                            "Failed to initialize options."));
+                        LogButtonBlink();
+                    }
                 }
 
                 if (OptionsData.discordOptions == null)
@@ -1276,7 +1307,6 @@ public void UpdateAddNewUserGroup(Color clr, bool none = false)
 
         public void LogEvent(LogData data)
         {
-
             if (File.Exists(pathLogs))
             {
                 try
@@ -2130,6 +2160,9 @@ public void RemoveShadowForm()
 
         public void SwitchLlamaState(bool showLlama) => pbHeader.Image = showLlama ? Properties.Resources.llama : Properties.Resources.ic_account_balance_wallet_white_48dp;
 
+        public void HidePbShowDiscordUser() => pbShowDiscordUser.Visible = false;
+        public void ShowPbShowDiscordUser() => pbShowDiscordUser.Visible = discordUser != null;
+
         public void ShowEamLogoGif(string _url, Action<object, EventArgs> action)
         {
             string url = API_BASE_URL + _url;

diff --git a/ExaltAccountManager/OLD/FrmOptions.cs b/ExaltAccountManager/OLD/FrmOptions.cs
@@ -394,6 +394,7 @@ public sealed class OptionsData
         public bool deactivateKillswitch = true;
 
         public int snackbarPosition = 8;
+        public bool hideSnackbarOnPlay = false;
 
         public DiscordOptions discordOptions = new DiscordOptions() { ShowAccountNames = true, ShowMenus = true, ShowState = true };
         public AnalyticsOptions analyticsOptions = new AnalyticsOptions() { OptOut = false, Anonymization = false };

diff --git a/ExaltAccountManager/UI/Elements/EleGameUpdater.cs b/ExaltAccountManager/UI/Elements/EleGameUpdater.cs
@@ -63,6 +63,7 @@ private GameUpdaterUIState UIState
                         break;
                     case GameUpdaterUIState.UpdateInProgress:
                         {
+                            frm.HidePbShowDiscordUser();
                             this.Height = progressbar.Bottom + 17;
 
                             pbClose.Enabled =
@@ -82,6 +83,7 @@ private GameUpdaterUIState UIState
                         break;
                     case GameUpdaterUIState.UpdateDone:
                         {
+                            frm.ShowPbShowDiscordUser();
                             this.Height = btnDone.Bottom + 17;
 
                             btnCheckForUpdate.Enabled =

diff --git a/ExaltAccountManager/UI/UIAccounts.cs b/ExaltAccountManager/UI/UIAccounts.cs
@@ -137,6 +137,8 @@ public void ApplyTheme(object sender, EventArgs e)
             scrollbar.BackgroundColor = frm.UseDarkmode ? def : third;
             scrollbar.ThumbColor = frm.UseDarkmode ? third : Color.Gray;
 
+            #region DropDowns
+
             dropServers.BackgroundColor =
             dropOrder.BackgroundColor = def;
             dropServers.ForeColor =
@@ -152,6 +154,10 @@ public void ApplyTheme(object sender, EventArgs e)
             dropServers.Invalidate();
             dropOrder.Invalidate();
 
+            #endregion
+
+            #region DataGridView
+
             dataGridView.BackgroundColor = second;
             dataGridView.CurrentTheme.BackColor = frm.UseDarkmode ? Color.FromArgb(77, 10, 173) : Color.FromArgb(107, 40, 203);
             dataGridView.CurrentTheme.GridColor = dataGridView.GridColor = frm.UseDarkmode ? third : Color.WhiteSmoke;
@@ -163,6 +169,10 @@ public void ApplyTheme(object sender, EventArgs e)
 
             dataGridView.ApplyTheme(dataGridView.CurrentTheme);
 
+            #endregion
+
+            #region ToolTip
+
             toolTip.BackColor = def;
             toolTip.TitleForeColor = font;
             toolTip.TextForeColor = frm.UseDarkmode ? Color.WhiteSmoke : Color.FromArgb(64, 64, 64);
@@ -181,6 +191,8 @@ public void ApplyTheme(object sender, EventArgs e)
             toolTip.SetToolTipIcon(toggleShowInVP, frm.UseDarkmode ? Properties.Resources.btn_icon_chest_1 : Properties.Resources.btn_icon_chest_2);
             toolTip.SetToolTipIcon(lShowInVP, frm.UseDarkmode ? Properties.Resources.btn_icon_chest_1 : Properties.Resources.btn_icon_chest_2);
 
+            #endregion
+
             FormsUtils.ResumeDrawing(this);
         }
 
@@ -424,7 +436,11 @@ private bool StartGameForAccount(MK_EAM_Lib.AccountInfo _info)
             try
             {
                 frm.LogEvent(new LogData(-1, "EAM AccUI", LogEventType.Login, $"Start login into account: {_info.email}."));
-                frm.ShowSnackbar($"Start login into account: {_info.email}.", Bunifu.UI.WinForms.BunifuSnackbar.MessageTypes.Information, 3000);
+
+                if (!frm.OptionsData.hideSnackbarOnPlay)
+                {
+                    frm.ShowSnackbar($"Start login into account: {_info.email}.", Bunifu.UI.WinForms.BunifuSnackbar.MessageTypes.Information, 3000);
+                }
 
                 string arguments = string.Format("\"data:{{platform:Deca,guid:{0},token:{1},tokenTimestamp:{2},tokenExpiration:{3},env:4,serverName:{4}}}\"",
                                    StringToBase64String(_info.email), StringToBase64String(_info.accessToken.token), StringToBase64String(_info.accessToken.creationTime), StringToBase64String(_info.accessToken.expirationTime), GetServerName(_info.serverName));

diff --git a/ExaltAccountManager/UI/UIChangelog.cs b/ExaltAccountManager/UI/UIChangelog.cs
@@ -12,16 +12,30 @@ public sealed partial class UIChangelog : UserControl
 
         private readonly BindingList<ChangelogEntry> changelogEntries = new BindingList<ChangelogEntry>()
         {
+            new ChangelogEntry()
+            {
+                ReleaseDate = new DateTime(2023, 10, 14),
+                Version = new Version(3, 3, 0),
+                Name = "More Bug fixes and improvements",
+                Description = $"<b>OPTIONS</b>{Environment.NewLine}{Environment.NewLine}" +
+                              $"- Added a new toggle to hide the snackbar on login.{Environment.NewLine}" +
+                              $"&nbsp;&nbsp;&nbsp;This avoids the blinking in the taskbar.{Environment.NewLine}{Environment.NewLine}" +
+                              $"<b>BUG FIXES</b>{Environment.NewLine}" +
+                              $"- Fixed a crashing bug when the chartCanvas is null.{Environment.NewLine}" +
+                              $"- Fixed a crashing bug when saving the options.{Environment.NewLine}" +
+                              $"- Fixed a bug that disabled the UpdaterUI during the game update.{Environment.NewLine}{Environment.NewLine}" +
+                              $"- Thanks to <b>Ykao</b> for reporting bugs and requesting features!"
+            },
             new ChangelogEntry()
             {
                 ReleaseDate = new DateTime(2023, 07, 19),
                 Version = new Version(3, 2, 1),
                 Name = "Bug fixes and improvements",
                 Description = $"<b>BUG FIXES</b>{Environment.NewLine}{Environment.NewLine}" +
-                              $"- Fixed the scaling issues{Environment.NewLine}" +
-                              $"- Fixed the top controls to the right side{Environment.NewLine}" +
-                              $"- Fixed the discord username for the new usernames without discriminator{Environment.NewLine}" +
-                              $"- Addded a check for the default game path, if the game.exe can't be found{Environment.NewLine}{Environment.NewLine}"
+                              $"- Fixed the scaling issues.{Environment.NewLine}" +
+                              $"- Fixed the top controls to the right side.{Environment.NewLine}" +
+                              $"- Fixed the discord username for the new usernames without discriminator.{Environment.NewLine}" +
+                              $"- Addded a check for the default game path, if the game.exe can't be found.{Environment.NewLine}{Environment.NewLine}"
             },
             new ChangelogEntry()
             {
@@ -76,12 +90,12 @@ public sealed partial class UIChangelog : UserControl
                             $"&nbsp;&nbsp;&nbsp;This is NO automation tool.{Environment.NewLine}" +
                             $"ℹ️ The Captcha Aid tool is still in beta, please report feedback.{Environment.NewLine}{Environment.NewLine}" +
                             $"<b>INSTALLER</b>{Environment.NewLine}" +
-                            $"- Added a new simple installer for EAM.{Environment.NewLine}{Environment.NewLine}" + 
+                            $"- Added a new simple installer for EAM.{Environment.NewLine}{Environment.NewLine}" +
                             $"<b>EAM UPDATER</b>{Environment.NewLine}" +
                             $"- Added an updater to EAM, no manuall downloads needed anymore!{Environment.NewLine}{Environment.NewLine}" +
                             $"<b>EAM NEWS</b>{Environment.NewLine}" +
                             $"- Added a new system display custom news.{Environment.NewLine}" +
-                            $"- Added multiple components to display.{Environment.NewLine}"+ 
+                            $"- Added multiple components to display.{Environment.NewLine}"+
                             $"- Added Polls to ask questions to you, the community.{Environment.NewLine}{Environment.NewLine}" +
                             $"<b>DISCORD INTEGRATION</b>{Environment.NewLine}" +
                             $"- Added Discord-RPC support.{Environment.NewLine}" +
@@ -103,7 +117,7 @@ public sealed partial class UIChangelog : UserControl
                             $"- Added anonym analytics for the EAM-usage.{Environment.NewLine}" +
                             $"- Any data collected is anonym and does NOT contain login informations.{Environment.NewLine}" +
                             $"- All collected data is sent encrypted (SSL) to the server.{Environment.NewLine}" +
-                            $"- All collected data is used for improving EAM and it's features.{Environment.NewLine}" +   
+                            $"- All collected data is used for improving EAM and it's features.{Environment.NewLine}" +
                             $"- You can choose to send no clientId or opt-out in the options.{Environment.NewLine}{Environment.NewLine}" +
                             $"<b>EAM MICROSERVICE</b>{Environment.NewLine}" +
                             $"- Added an REST-API that is running on a VPS.{Environment.NewLine}" +
@@ -128,7 +142,7 @@ public sealed partial class UIChangelog : UserControl
             },
             new ChangelogEntry() {
                 ReleaseDate = new DateTime(2022, 02, 26),
-                Version = new Version(3, 0, 0),                       
+                Version = new Version(3, 0, 0),
                 Name = "Complete overhaul, Muledump Replica: Vault Peeker and more",
                 Description = $"<b>COMPLETE OVERHAUL</b>{Environment.NewLine}{Environment.NewLine}" +
                               $"- Completely changed the UI.{Environment.NewLine}" +
@@ -140,7 +154,7 @@ public sealed partial class UIChangelog : UserControl
                               $"&nbsp;&nbsp;&nbsp;Vault Peeker is limited to 50 accounts.{Environment.NewLine}" +
                               $"- Improved performance a lot.{Environment.NewLine}{Environment.NewLine}" +
                               $"<b>MODULES</b>{Environment.NewLine}" +
-                              $"- Simple collection of all important tools.{Environment.NewLine}{Environment.NewLine}" +                              
+                              $"- Simple collection of all important tools.{Environment.NewLine}{Environment.NewLine}" +
                               $"<b>IMPORT & EXPORT</b>{Environment.NewLine}" +
                               $"- Added a custom Importer for text-based formats.{Environment.NewLine}" +
                               $"- Added a custom Exporter, to export your accounts as needed.{Environment.NewLine}" +
@@ -299,7 +313,7 @@ public UIChangelog(FrmMain _frm)
             dataGridView.Columns[0].SortMode = DataGridViewColumnSortMode.Automatic;
             dataGridView.MouseWheel += dataGridView_MouseWheel;
             eleChangelog = new Elements.EleChangelog(frm);
-            
+
 
             frm.ThemeChanged += ApplyTheme;
             ApplyTheme(frm, null);

diff --git a/ExaltAccountManager/UI/UIDailyLogins.cs b/ExaltAccountManager/UI/UIDailyLogins.cs
@@ -19,7 +19,7 @@ public sealed partial class UIDailyLogins : UserControl
         private DailyLogins dailyLogins = new DailyLogins();
 
         private Bunifu.Charts.WinForms.BunifuChartCanvas chartCanvas = null;
-        
+
         public UIDailyLogins(FrmMain _frm)
         {
             InitializeComponent();
@@ -36,7 +36,7 @@ public UIDailyLogins(FrmMain _frm)
             frm = _frm;
 
             frm.ThemeChanged += ApplyTheme;
-            this.Disposed += (object sender, EventArgs e) => frm.ThemeChanged -= ApplyTheme;            
+            this.Disposed += (object sender, EventArgs e) => frm.ThemeChanged -= ApplyTheme;
 
             if (File.Exists(frm.dailyLoginsPath))
             {
@@ -196,8 +196,10 @@ private void UIDailyLogins_Load(object sender, EventArgs e)
 
         private void LoadUI()
         {
-            chartCanvas.Labels = GetDaysLabels();
-
+            if (chartCanvas != null)
+            {
+                chartCanvas.Labels = GetDaysLabels();
+            }
             List<double> success = new List<double>() { 0, 0, 0, 0, 0, 0, 0 };
             List<double> failed = new List<double>() { 0, 0, 0, 0, 0, 0, 0 };
 
@@ -232,11 +234,12 @@ private void LoadUI()
 
             success.Reverse();
             failed.Reverse();
-
-            barChartSuccess.Data = success;
-            barChartFailed.Data = failed;
-
-            timerAnimate.Start();
+            if (chartCanvas != null && barChartSuccess != null && barChartFailed != null)
+            {
+                barChartSuccess.Data = success;
+                barChartFailed.Data = failed;
+                timerAnimate.Start();
+            }
         }
 
         private void timerAnimate_Tick(object sender, EventArgs e)