Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Credential identities are more carefully prepared for display now

Browse Source
This commit is contained in:
Simon Rozman
2016-08-31 16:50:12 +02:00
parent 60f1b4ccfb
commit d9bfcc3e49
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/EAPBase/src/Credentials.cpp
View File

@@ -144,9 +144,10 @@ wstring eap::credentials::get_identity() const
tstring eap::credentials::get_name() const
{
if (empty()) return _T("<empty>");
tstring identity(std::move(get_identity()));
return !identity.empty() ? identity : _T("<blank>");
return
!identity.empty() ? identity :
empty() ? _T("<empty>") : _T("<blank ID>");
}

20
lib/EAPBase_UI/include/EAP_UI.h
View File

@@ -720,23 +720,19 @@ protected:
inline void UpdateOwnIdentity()
{
if (m_cred_own.empty())
m_own_identity->SetValue(_("<empty>"));
else {
wxString identity(m_cred_own.get_name());
m_own_identity->SetValue(!identity.empty() ? identity : _("<blank>"));
}
wxString identity(m_cred_own.get_identity());
m_own_identity->SetValue(
!identity.empty() ? identity :
m_cred_own.empty() ? _("<empty>") : _("<blank ID>"));
}
inline void UpdatePresharedIdentity()
{
if (m_cred_preshared.empty())
m_preshared_identity->SetValue(_("<empty>"));
else {
wxString identity(m_cred_preshared.get_name());
m_preshared_identity->SetValue(!identity.empty() ? identity : _("<blank>"));
}
wxString identity(m_cred_preshared.get_identity());
m_preshared_identity->SetValue(
!identity.empty() ? identity :
m_cred_preshared.empty() ? _("<empty>") : _("<blank ID>"));
}
/// \endcond