Upfate 3.7.2

vektor9999 · Feb 22, 2025 · a01521a · a01521a
1 parent 54a2ea9
commit a01521a
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 21 deletions.
diff --git a/Vcc.Nolvus.Dashboard/Frames/ErrorFrame.cs b/Vcc.Nolvus.Dashboard/Frames/ErrorFrame.cs
@@ -67,7 +67,9 @@ public ErrorFrame(IDashboard Dashboard, FrameParameters Params) :
             LblTitle.Text = Title;
             LblError.Text = Message;
             LblTrace.Text = Trace;
-            BtnRetry.Visible = Retry;               
+            BtnRetry.Visible = Retry;
+            ServiceSingleton.Dashboard.Title("Nolvus Dashboard - [Error]");
+            ServiceSingleton.Dashboard.Info("Error");
         }                 
 
         private void BtnRetry_Click(object sender, EventArgs e)

diff --git a/Vcc.Nolvus.Dashboard/Frames/Settings/GlobalSettingsFrame.cs b/Vcc.Nolvus.Dashboard/Frames/Settings/GlobalSettingsFrame.cs
@@ -47,20 +47,28 @@ public GlobalSettingsFrame(IDashboard Dashboard, FrameParameters Params)
 
         protected override void OnLoad()
         {
-            ServiceSingleton.Dashboard.Title("Nolvus Dashboard - [Settings]");
-            ServiceSingleton.Dashboard.Info("Global Settings");
+            try
 
-            TxtBxUserName.Text = ServiceSingleton.Globals.MegaEmail;
-            TxtBxPassword.Text = ServiceSingleton.Globals.MegaPassword;
+            {
+                ServiceSingleton.Dashboard.Title("Nolvus Dashboard - [Settings]");
+                ServiceSingleton.Dashboard.Info("Global Settings");
+
+                TxtBxUserName.Text = ServiceSingleton.Globals.MegaEmail;
+                TxtBxPassword.Text = ServiceSingleton.Globals.MegaPassword;
 
-            PnlMessage.BackColor = Color.FromArgb(92, 184, 92);
-            PicBox.Image = Properties.Resources.Info;
+                PnlMessage.BackColor = Color.FromArgb(92, 184, 92);
+                PicBox.Image = Properties.Resources.Info;
 
-            TglBtnAnonymous.ToggleState = ToggleButtonState.Active;
+                TglBtnAnonymous.ToggleState = ToggleButtonState.Active;
 
-            if (!ServiceSingleton.Globals.MegaAnonymousConnection)
+                if (!ServiceSingleton.Globals.MegaAnonymousConnection)
+                {
+                    TglBtnAnonymous.ToggleState = ToggleButtonState.Inactive;
+                }                
+            }
+            catch(Exception ex)
             {
-                TglBtnAnonymous.ToggleState = ToggleButtonState.Inactive;
+                ServiceSingleton.Dashboard.Error("Error during global settings loading", ex.Message, ex.StackTrace);
             }
         }
 
@@ -87,21 +95,29 @@ private void LnkLblInfo_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
 
         private async void BtnSaveMegaInfo_Click(object sender, EventArgs e)
         {
-            if (TglBtnAnonymous.ToggleState == ToggleButtonState.Inactive && TxtBxUserName.Text == string.Empty && TxtBxPassword.Text == string.Empty)
+            if (TglBtnAnonymous.ToggleState == ToggleButtonState.Inactive && TxtBxUserName.Text.Trim() == string.Empty && TxtBxPassword.Text.Trim() == string.Empty)
             {
                 NolvusMessageBox.ShowMessage("Error", "Please enter your credentials!", MessageBoxType.Error);
             }
             else
-            {
+            {                
                 try
                 {
                     if (TglBtnAnonymous.ToggleState == ToggleButtonState.Inactive)
                     {
                         UpdateButton("Validating...");
-                        await ServiceSingleton.Files.AuthenticateToMegaApi(TxtBxUserName.Text, TxtBxPassword.Text);
-                        UpdateButton("Save");
-                    }
+                        await ServiceSingleton.Files.AuthenticateToMegaApi(TxtBxUserName.Text, TxtBxPassword.Text);                                              
+                    }                    
+                }
+                catch
+                {
+                    UpdateButton("Save");
+                    NolvusMessageBox.ShowMessage("Error", "Unable to connect to mega.nz! Please review your credentials", MessageBoxType.Error);
+                    return;
+                }
 
+                try
+                {
                     ServiceSingleton.Globals.MegaAnonymousConnection = TglBtnAnonymous.ToggleState == ToggleButtonState.Active;
 
                     if (TxtBxUserName.Text != string.Empty)
@@ -112,15 +128,14 @@ private async void BtnSaveMegaInfo_Click(object sender, EventArgs e)
                     if ( TxtBxPassword.Text != string.Empty)
                     {
                         ServiceSingleton.Globals.MegaPassword = TxtBxPassword.Text;
-                    }
-
+                    }                    
 
                     NolvusMessageBox.ShowMessage("Information", "Your mega.nz configuration has been valiated and saved", MessageBoxType.Info);
                 }
-                catch (Exception Ex)
+                catch(Exception ex)
                 {
                     UpdateButton("Save");
-                    NolvusMessageBox.ShowMessage("Error", "Unable to connect to mega.nz! Please review your credentials", MessageBoxType.Error);
+                    NolvusMessageBox.ShowMessage("Error", string.Format("Unexpected error ocurred with message : {0}", ex.Message), MessageBoxType.Error);                                            
                 }                    
             }
         }

diff --git a/Vcc.Nolvus.Dashboard/Properties/AssemblyInfo.cs b/Vcc.Nolvus.Dashboard/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.7.1")]
-[assembly: AssemblyFileVersion("3.7.1.0")]
+[assembly: AssemblyVersion("3.7.2")]
+[assembly: AssemblyFileVersion("3.7.2.0")]