set/k7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refractor some identifiers to be more meaningful.

Browse Source 
m_popupUid -> m_popupCertifyUid
CertifyKey() -> EditUidValidity()
This commit is contained in:
SET
2020-11-22 14:28:52 +01:00
parent 110e5e4fb3
commit 6f15ab4d06
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
KeyEdit.cpp
View File

@@ -20,7 +20,7 @@ KeyEdit::KeyEdit(K7Main * owner)
: WObject() : WObject()
{ {
m_owner = owner; m_owner = owner;
m_popupUid = NULL; m_popupCertifyUid = NULL;
m_popupExpiryTime = NULL; m_popupExpiryTime = NULL;
m_popupAddUid = NULL; m_popupAddUid = NULL;
m_targetUidValidityKeyFpr = WString::Empty; m_targetUidValidityKeyFpr = WString::Empty;
@@ -29,7 +29,7 @@ KeyEdit::KeyEdit(K7Main * owner)
KeyEdit::~KeyEdit() KeyEdit::~KeyEdit()
{ {
delete m_popupUid; delete m_popupCertifyUid;
} }
void KeyEdit::OnOwnerTrustDoubleClicked(WTreeTableNode * keyNode, bool keyHasSecret) void KeyEdit::OnOwnerTrustDoubleClicked(WTreeTableNode * keyNode, bool keyHasSecret)
@@ -130,67 +130,67 @@ void KeyEdit::OnUidValidityClicked(WTreeTableNode* uidNode, vector<WString>& pri
if (targetKeyFpr != m_targetUidValidityKeyFpr) if (targetKeyFpr != m_targetUidValidityKeyFpr)
{ {
bool passwordVisibility = true; bool passwordVisibility = true;
if (m_popupUid) if (m_popupCertifyUid)
passwordVisibility = m_popupUid->IsPasswordVisible(); passwordVisibility = m_popupCertifyUid->IsPasswordVisible();
delete m_popupUid; delete m_popupCertifyUid;
WText * lblUidValidity = static_cast<WText*> (uidNode->columnWidget(2)); WText * lblUidValidity = static_cast<WText*> (uidNode->columnWidget(2));
m_popupUid = new PopupCertifyUserId(lblUidValidity, m_owner->m_tmwMessage); m_popupCertifyUid = new PopupCertifyUserId(lblUidValidity, m_owner->m_tmwMessage);
m_popupUid->Create(privateKeys, targetKeyFpr); m_popupCertifyUid->Create(privateKeys, targetKeyFpr);
m_popupUid->ShowPassphrase(passwordVisibility); m_popupCertifyUid->ShowPassphrase(passwordVisibility);
m_targetUidValidityKeyFpr = targetKeyFpr; m_targetUidValidityKeyFpr = targetKeyFpr;
m_popupUid->GetCertifyButton()->clicked().connect(this, &KeyEdit::CertifyKey); m_popupCertifyUid->GetCertifyButton()->clicked().connect(this, &KeyEdit::EditUidValidity);
} }
m_popupUid->show(); m_popupCertifyUid->show();
} }
void KeyEdit::CertifyKey() void KeyEdit::EditUidValidity()
{ {
vector<uint>& uidsToSign = m_popupUid->GetUidsToSign(); vector<uint>& uidsToSign = m_popupCertifyUid->GetUidsToSign();
if (uidsToSign.size() == 0) if (uidsToSign.size() == 0)
{ {
m_owner->m_tmwMessage->SetText(TR("NoUidSelected")); m_owner->m_tmwMessage->SetText(TR("NoUidSelected"));
return; return;
} }
const WString signingKey = m_popupUid->GetSelectedKey(); const WString signingKey = m_popupCertifyUid->GetSelectedKey();
const WString keyToSign = m_popupUid->GetKeyToSign(); const WString keyToSign = m_popupCertifyUid->GetKeyToSign();
GpgMEWorker gpgWorker; GpgMEWorker gpgWorker;
GpgME::Error e; GpgME::Error e;
if (m_popupUid->WhatToDo() == PopupCertifyUserId::CertifyUid) if (m_popupCertifyUid->WhatToDo() == PopupCertifyUserId::CertifyUid)
{ {
int options = m_popupUid->GetCertifyOptions(); int options = m_popupCertifyUid->GetCertifyOptions();
e = gpgWorker.CertifyKey(signingKey.toUTF8().c_str(), e = gpgWorker.CertifyKey(signingKey.toUTF8().c_str(),
keyToSign.toUTF8().c_str(), keyToSign.toUTF8().c_str(),
uidsToSign, options, uidsToSign, options,
m_popupUid->GetPassphrase()); m_popupCertifyUid->GetPassphrase());
} }
else else
{ {
vector<GpgME::UserID> uidsToRevoke vector<GpgME::UserID> uidsToRevoke
= m_popupUid->GetUidsToRevokeCertification(); = m_popupCertifyUid->GetUidsToRevokeCertification();
e = gpgWorker.RevokeKeyCertifications(signingKey.toUTF8().c_str(), e = gpgWorker.RevokeKeyCertifications(signingKey.toUTF8().c_str(),
keyToSign.toUTF8().c_str(), keyToSign.toUTF8().c_str(),
uidsToRevoke, uidsToRevoke,
m_popupUid->GetPassphrase()); m_popupCertifyUid->GetPassphrase());
} }
if (e.code() != 0) if (e.code() != 0)
{ {
if (m_popupUid->WhatToDo() == PopupCertifyUserId::CertifyUid) if (m_popupCertifyUid->WhatToDo() == PopupCertifyUserId::CertifyUid)
{ {
m_owner->m_tmwMessage->SetText(e.asString()); m_owner->m_tmwMessage->SetText(e.asString());
m_popupUid->ShowPassphrase(true); m_popupCertifyUid->ShowPassphrase(true);
return; return;
} }
else { else {
m_owner->m_tmwMessage->SetText(e.asString()); m_owner->m_tmwMessage->SetText(e.asString());
m_popupUid->ShowPassphrase(true); m_popupCertifyUid->ShowPassphrase(true);
return; return;
} }
} }
if (m_popupUid->WhatToDo() == PopupCertifyUserId::CertifyUid) if (m_popupCertifyUid->WhatToDo() == PopupCertifyUserId::CertifyUid)
m_owner->m_tmwMessage->SetText(TR("CertificationSuccess")); m_owner->m_tmwMessage->SetText(TR("CertificationSuccess"));
else else
m_owner->m_tmwMessage->SetText(TR("RevocationSuccess")); m_owner->m_tmwMessage->SetText(TR("RevocationSuccess"));
m_popupUid->ShowPassphrase(false); m_popupCertifyUid->ShowPassphrase(false);
m_owner->DisplayUids(keyToSign); m_owner->DisplayUids(keyToSign);
} }

4
KeyEdit.h
View File

@@ -39,7 +39,7 @@ private:
virtual ~KeyEdit(); virtual ~KeyEdit();
K7Main * m_owner; K7Main * m_owner;
PopupCertifyUserId * m_popupUid; PopupCertifyUserId * m_popupCertifyUid;
WString m_targetUidValidityKeyFpr; WString m_targetUidValidityKeyFpr;
PopupExpiryTime * m_popupExpiryTime; PopupExpiryTime * m_popupExpiryTime;
@@ -57,7 +57,7 @@ private:
* @param keyHasSecret * @param keyHasSecret
*/ */
void FillOwnerTrustCombo(WComboBox * cmb, bool keyHasSecret); void FillOwnerTrustCombo(WComboBox * cmb, bool keyHasSecret);
void CertifyKey(); void EditUidValidity();
void SetExpiryTime(); void SetExpiryTime();
void AddOrRevokeUid(); void AddOrRevokeUid();