Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SSH Agent: Update available attachments immediately #1679

Merged

Conversation

luzat
Copy link
Contributor

@luzat luzat commented Mar 8, 2018

Description

The list of available attachments for SSH agent is now updated
immediately when adding or removing file attachments.

Motivation and context

When adding or removing attachments, the list of available attachments was previously only updated after hitting Apply or OK.

Closes #1668.

How has this been tested?

Built on Linux, ran tests and tried adding and removing files with previously empty and non-empty lists. Also checked if removing a selected file would lead to an error.

Types of changes

  • ✅ Bug fix (non-breaking change which fixes an issue)

Checklist:

  • ✅ I have read the CONTRIBUTING document. [REQUIRED]
  • ✅ My code follows the code style of this project. [REQUIRED]
  • ✅ All new and existing tests passed. [REQUIRED]
  • ✅ I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]

Copy link
Member

@hifi hifi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto.

@droidmonkey
Copy link
Member

Please rebase onto release/2.3.2

@droidmonkey droidmonkey added this to the v2.3.2 milestone Mar 11, 2018
The list of available attachments for SSH agent is now updated
immediately when adding or removing file attachments.

Closes keepassxreboot#1668.
@luzat luzat force-pushed the fix-agent-attachments branch from d8dccf6 to b28bf08 Compare March 11, 2018 11:44
@luzat
Copy link
Contributor Author

luzat commented Mar 11, 2018

Not sure if I am doing this right: rebasing from develop onto release/2.3.x introduces all these other commits to the PR. Anything that I should change with regards to git usage?

@hifi
Copy link
Member

hifi commented Mar 11, 2018

Use the edit button next to the PR title to change the base branch. It's under the title in edit mode.

@luzat luzat changed the base branch from develop to release/2.3.2 March 11, 2018 12:16
@droidmonkey
Copy link
Member

The command line version is: git rebase release/2.3.2 when you have your fix-agent-attachments checked out.

@luzat
Copy link
Contributor Author

luzat commented Mar 11, 2018

Rebasing (and pushing) alone - which is what I did before - did not seem to update the state of where I want it to be merged here. rebase and changing the base branch helped. This makes sense, but I wasn't aware of the option to change the base branch here previously.

@hifi hifi removed the needs rebase label Mar 11, 2018
@droidmonkey droidmonkey merged commit 46099fd into keepassxreboot:release/2.3.2 Mar 11, 2018
@@ -281,6 +281,8 @@ void EditEntryWidget::setupSSHAgent()
connect(m_sshAgentUi->decryptButton, SIGNAL(clicked()), SLOT(decryptPrivateKey()));
connect(m_sshAgentUi->copyToClipboardButton, SIGNAL(clicked()), SLOT(copyPublicKey()));

connect(m_advancedUi->attachmentsWidget->entryAttachments(), SIGNAL(modified()), SLOT(updateAttachments()));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updateAttachments() should be updateSSHAgentAttachments()? I got the following error on the latest git:

QObject::connect: No such slot EditEntryWidget::updateAttachments()
QObject::connect:  (receiver name: 'EditWidget')
QObject::connect: No such slot EditEntryWidget::updateAttachments()
QObject::connect:  (receiver name: 'EditWidget')

Copy link
Contributor Author

@luzat luzat Mar 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed and fixed in #1787 Must have forgotten to add the final version to the commit. Now works and does not give the error message and updates as expected.

luzat added a commit to luzat/keepassxc that referenced this pull request Mar 28, 2018
Fixes an error message and non-working functionality introduced by a
wrong slot referenced in PR keepassxreboot#1679.
droidmonkey pushed a commit that referenced this pull request Apr 5, 2018
Fixes an error message and non-working functionality introduced by a
wrong slot referenced in PR #1679.
droidmonkey added a commit that referenced this pull request May 8, 2018
- Enable high entropy ASLR on Windows [#1747]
- Enhance favicon fetching [#1786]
- Fix crash on Windows due to autotype [#1691]
- Fix dark tray icon changing all icons [#1680]
- Fix --pw-stdin not using getPassword function [#1686]
- Fix placeholders being resolved in notes [#1907]
- Enable auto-type start delay to be configurable [#1908]
- Browser: Fix native messaging reply size [#1719]
- Browser: Increase maximum buffer size [#1720]
- Browser: Enhance usability and functionality [#1810, #1822, #1830, #1884, #1906]
- SSH Agent: Parse aes-256-cbc/ctr keys [#1682]
- SSH Agent: Enhance usability and functionality [#1677, #1679, #1681, #1787]
jtl999 pushed a commit to jtl999/keepassxc that referenced this pull request Jul 29, 2018
Fixes an error message and non-working functionality introduced by a
wrong slot referenced in PR keepassxreboot#1679.
@phoerious phoerious added pr: new feature Pull request that adds a new feature and removed new feature labels Nov 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature: SSH agent pr: new feature Pull request that adds a new feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants