Code cleanup

share/translations/keepassxc_en.ts

@@ -6262,6 +6262,14 @@ Expect some bugs and minor issues, this version is meant for testing purposes.</
         <source>E&amp;xpire Entry…</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clear SSH Agent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear all identities in ssh-agent</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>

src/gui/DatabaseWidget.cpp

@@ -865,16 +865,6 @@ void DatabaseWidget::removeFromAgent()
         m_messageWidget->showMessage(settings.errorString(), MessageWidget::Error);
     }
 }
-
-void DatabaseWidget::clearSSHAgent()
-{
-    SSHAgent* agent = SSHAgent::instance();
-    if (!agent->clearAllAgentIdentities()) {
-        showMessage(agent->errorString(), MessageWidget::Error);
-    } else {
-        showMessage(agent->errorString(), MessageWidget::Positive);
-    }
-}
 #endif
 
 void DatabaseWidget::performAutoType(const QString& sequence)

src/gui/DatabaseWidget.h

@@ -205,7 +205,6 @@ public slots:
 #ifdef WITH_XC_SSHAGENT
     void addToAgent();
     void removeFromAgent();
-    void clearSSHAgent();
 #endif
     void performAutoType(const QString& sequence = {});
     void performAutoTypeUsername();

src/gui/MainWindow.cpp

@@ -211,7 +211,10 @@ MainWindow::MainWindow()
 #ifdef WITH_XC_SSHAGENT
     connect(sshAgent(), SIGNAL(error(QString)), this, SLOT(showErrorMessage(QString)));
     connect(sshAgent(), SIGNAL(enabledChanged(bool)), this, SLOT(agentEnabled(bool)));
+    connect(m_ui->actionClearSSHAgent, SIGNAL(triggered()), SLOT(clearSSHAgent()));
     m_ui->settingsWidget->addSettingsPage(new AgentSettingsPage());
+#else
+    agentEnabled(false);
 #endif
 
 #if defined(WITH_XC_KEESHARE)
@@ -414,7 +417,7 @@ MainWindow::MainWindow()
 
     m_ui->actionSettings->setIcon(icons()->icon("configure"));
     m_ui->actionPasswordGenerator->setIcon(icons()->icon("password-generator"));
-    m_ui->actionFlushSSHAgent->setIcon(icons()->icon("utilities-terminal"));
+    m_ui->actionClearSSHAgent->setIcon(icons()->icon("utilities-terminal"));
 
     m_ui->actionAbout->setIcon(icons()->icon("help-about"));
     m_ui->actionDonate->setIcon(icons()->icon("donate"));
@@ -528,7 +531,6 @@ MainWindow::MainWindow()
 #ifdef WITH_XC_SSHAGENT
     m_actionMultiplexer.connect(m_ui->actionEntryAddToAgent, SIGNAL(triggered()), SLOT(addToAgent()));
     m_actionMultiplexer.connect(m_ui->actionEntryRemoveFromAgent, SIGNAL(triggered()), SLOT(removeFromAgent()));
-    m_actionMultiplexer.connect(m_ui->actionClearSSHAgent, SIGNAL(triggered()), SLOT(clearSSHAgent()));
 #endif
 
     m_actionMultiplexer.connect(m_ui->actionGroupNew, SIGNAL(triggered()), SLOT(createGroup()));
@@ -972,8 +974,8 @@ void MainWindow::updateMenuActionState()
     m_ui->actionEntryAddToAgent->setEnabled(hasSSHKey);
     m_ui->actionEntryRemoveFromAgent->setVisible(hasSSHKey);
     m_ui->actionEntryRemoveFromAgent->setEnabled(hasSSHKey);
-    m_ui->actionFlushSSHAgent->setVisible(sshAgent()->isEnabled());
-    m_ui->actionFlushSSHAgent->setEnabled(sshAgent()->isEnabled());
+    m_ui->actionClearSSHAgent->setVisible(sshAgent()->isEnabled());
+    m_ui->actionClearSSHAgent->setEnabled(sshAgent()->isEnabled());
 #endif
 
     m_ui->actionGroupNew->setEnabled(groupSelected && !inRecycleBin);
@@ -1464,6 +1466,15 @@ void MainWindow::disableMenuAndToolbar()
     m_ui->menubar->setDisabled(true);
 }
 
+void MainWindow::clearSSHAgent()
+{
+#ifdef WITH_XC_SSHAGENT
+    auto agent = SSHAgent::instance();
+    auto ret = agent->clearAllAgentIdentities();
+    displayGlobalMessage(agent->errorString(), ret ? MessageWidget::Positive : KMessageWidget::Error, false);
+#endif
+}
+
 void MainWindow::saveWindowInformation()
 {
     if (isVisible()) {
@@ -2084,9 +2095,7 @@ void MainWindow::initActionCollection()
                     m_ui->actionGroupEmptyRecycleBin,
                     // Tools Menu
                     m_ui->actionPasswordGenerator,
-#ifdef WITH_XC_SSHAGENT
                     m_ui->actionClearSSHAgent,
-#endif
                     m_ui->actionSettings,
                     // View Menu
                     m_ui->actionThemeAuto,

src/gui/MainWindow.h

@@ -155,6 +155,7 @@ private slots:
     void focusSearchWidget();
     void enableMenuAndToolbar();
     void disableMenuAndToolbar();
+    void clearSSHAgent();
 
 private:
     static const QString BaseWindowTitle;

src/gui/MainWindow.ui

@@ -1318,7 +1318,7 @@
     <string>Clear SSH Agent</string>
    </property>
    <property name="toolTip">
-    <string>Clear all identities like ssh-add -D</string>
+    <string>Clear all identities in ssh-agent</string>
    </property>
    <property name="menuRole">
     <enum>QAction::TextHeuristicRole</enum>

src/gui/entry/EditEntryWidget.cpp

@@ -825,12 +825,8 @@ void EditEntryWidget::removeKeyFromAgent()
 
 void EditEntryWidget::clearAgent()
 {
-    if (!sshAgent()->clearAllAgentIdentities()) {
-        showMessage(sshAgent()->errorString(), MessageWidget::Error);
-        return;
-    }
-
-    showMessage(sshAgent()->errorString(), MessageWidget::Positive);
+    auto ret = sshAgent()->clearAllAgentIdentities();
+    showMessage(sshAgent()->errorString(), ret ? MessageWidget::Positive : KMessageWidget::Error);
 }
 
 void EditEntryWidget::decryptPrivateKey()

src/sshagent/SSHAgent.cpp

@@ -384,7 +384,7 @@ bool SSHAgent::clearAllAgentIdentities()
     QByteArray responseData;
     BinaryStream request(&requestData);
 
-    // Same request order as OpenBSD ssh-add: useful?
+    // SSH2 Identity Removal
     request.write(SSH2_AGENTC_REMOVE_ALL_IDENTITIES);
 
     if (!sendMessage(requestData, responseData)) {
@@ -395,7 +395,7 @@ bool SSHAgent::clearAllAgentIdentities()
     request.flush();
     responseData.clear();
 
-    // Same request order as OpenBSD ssh-add: useful?
+    // SSH1 Identity Removal
     request.write(SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES);
 
     // ignore error-code for ssh1