marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix connection screen

Browse Source
This commit is contained in:
Roland Drabesch 2025-10-21 12:55:20 +02:00
parent cc142e2ce5
commit fa45156233
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/LaaPackages

@ -1 +1 @@
Subproject commit a9ef9051cabb74806a4ce0293794cf95756883e6
Subproject commit 41c1163d102dbb63572e60c6ffd501e1765d848c

22
Common/Ui/GenesisToolBox/FrmLowLevelTools.cs
View File

@ -399,9 +399,21 @@ namespace Xylem.Common.Ui.GenesisToolBox
}// Database returned valid passwords
else
{
// CASE 6: - The login succeeded but the password file request from database failed
LogText("Successfully logged in with the 'offline password'.\n" +
"Passwords cannot be acquired from the database and therefore not compared");
if (string.IsNullOrEmpty(_currentGenesis.OfflinePassword))
{
// CASE 6: - The login succeeded but the password file request from database failed and no offline pwd
LogText("Successfully logged in with the 'production password'\n" +
"Passwords cannot be acquired from the database and therefore not compared");
}
else
{
// CASE 7: - The login succeeded but the password file request from database failed and offlie pwd
LogText("Successfully logged in with the 'offline password'\n" +
"Passwords cannot be acquired from the database and therefore not compared");
}
}
}// Initial login succeeded
@ -417,7 +429,7 @@ namespace Xylem.Common.Ui.GenesisToolBox
Thread.Sleep(2000);
// Try to log in with password level 8 which may not be published to the database
var retVal = _currentGenesis.Login(Encoding.UTF8.GetString(pwdContainer.ListOfPasswords.Last()));
// CASE 6: - Passwords are generated in database and correctly installed. The login check will be done
// CASE 8: - Passwords are generated in database and correctly installed. The login check will be done
// with the generated password, but the 'production password' is still the 'SkeletonKey'.
// - The database update of the production password went wrong!
if (_currentGenesis.IsLoggedOn && retVal)
@ -436,7 +448,7 @@ namespace Xylem.Common.Ui.GenesisToolBox
{
// This is needed from meter as an unsuccessful login requires a delay for the next trial
Thread.Sleep(4000);
// CASE 7: - The production password didn't work, so the SkeletonKey will be tried.
// CASE 9: - The production password didn't work, so the SkeletonKey will be tried.
if (_currentGenesis.Login(pwdContainer.Skeleton))
{
ShowPasswordRepairMessage("Successfully logged in with 'SkeletonKey'\n" +

4
Common/Ui/GenesisToolBox/frmRegisterStore.cs
View File

@ -158,7 +158,7 @@ namespace Xylem.Common.Ui.GenesisToolBox
if (!string.IsNullOrEmpty(cbComSlot.SelectedItem.ToString()) &&
int.TryParse(cbComSlot.SelectedItem.ToString(), out var slotNR))
{
//SetBusy(true, "Connect");
SetBusy(true, "Connect");
if (Connect(slotNR))
{
Task.Factory.StartNew(() =>
@ -282,7 +282,7 @@ namespace Xylem.Common.Ui.GenesisToolBox
}
}
//SetBusy(false);
SetBusy(false);
}
}