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

Backport: Bring bug fixes into 2.5.4 #4567

Merged
merged 3 commits into from
Apr 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions release-tool
Original file line number Diff line number Diff line change
Expand Up @@ -1291,8 +1291,8 @@ appsign() {

# osslsigncode does not succeed at signing MSI files at this time...
logInfo "Signing file '${f}' using Microsoft signtool..."
signtool sign -f "${key}" -p "${password}" -d "KeePassXC" \
-t "http://timestamp.comodoca.com/authenticode" "${f}"
signtool sign -f "${key}" -p "${password}" -d "KeePassXC" -td sha256 \
-fd sha256 -tr "http://timestamp.comodoca.com/authenticode" "${f}"

if [ 0 -ne $? ]; then
exitError "Signing failed!"
Expand Down
72 changes: 10 additions & 62 deletions share/keepassxc.ini
Original file line number Diff line number Diff line change
@@ -1,62 +1,10 @@
[General]
RememberLastDatabases=true
RememberLastKeyFiles=true
OpenPreviousDatabasesOnStartup=true
AutoSaveAfterEveryChange=false
AutoSaveOnExit=false
AutoReloadOnChange=true
HideWindowOnCopy=false
MinimizeOnCopy=true
DropToBackgroundOnCopy=false
MinimizeOnOpenUrl=false
UseGroupIconOnEntryCreation=true
IgnoreGroupExpansion=false
AutoTypeEntryTitleMatch=true
GlobalAutoTypeKey=0
GlobalAutoTypeModifiers=0
LastOpenedDatabases=@Invalid()

[GUI]
Language=system
ShowTrayIcon=false
DarkTrayIcon=false
MinimizeToTray=false
MinimizeOnClose=false
MinimizeOnStartup=false
MonospaceNotes=false
MainWindowGeometry="@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\x2(\0\0\0\xbd\0\0\x5W\0\0\x3;\0\0\x2\x30\0\0\0\xdc\0\0\x5O\0\0\x3\x33\0\0\0\0\0\0\0\0\a\x80)"
SplitterState=@Invalid()
EntryListColumnSizes=@Invalid()
EntrySearchColumnSizes=@Invalid()

[security]
autotypeask=true
clearclipboard=true
clearclipboardtimeout=10
lockdatabaseidle=false
lockdatabaseidlesec=240
lockdatabaseminimize=false
lockdatabasescreenlock=true
passwordscleartext=false
passwordemptynodots=true
passwordsrepeat=false

[Http]
Enabled=false
ShowNotification=true
BestMatchOnly=false
UnlockDatabase=true
MatchUrlScheme=true
SortByUsername=false
Port=19455
AlwaysAllowAccess=false
AlwaysAllowUpdate=false
SearchInAllDatabases=false
SupportKphFields=true
generator\LowerCase=true
generator\UpperCase=true
generator\Numbers=true
generator\SpecialChars=false
generator\ExcludeAlike=true
generator\EnsureEvery=true
generator\Length=16
[General]
UpdateCheckMessageShown=false
LastActiveDatabase=@Invalid()
LastOpenedDatabases=@Invalid()
HideWindowOnCopy=false
MinimizeOnCopy=true

[GUI]
HideUsernames=false
HidePasswords=true
6 changes: 6 additions & 0 deletions src/gui/DatabaseWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1646,6 +1646,8 @@ bool DatabaseWidget::save()
m_blockAutoSave = true;
++m_saveAttempts;

auto focusWidget = qApp->focusWidget();

// TODO: Make this async
// Lock out interactions
m_entryView->setDisabled(true);
Expand All @@ -1660,6 +1662,10 @@ bool DatabaseWidget::save()
m_entryView->setDisabled(false);
m_groupView->setDisabled(false);

if (focusWidget) {
focusWidget->setFocus();
}

if (ok) {
m_saveAttempts = 0;
m_blockAutoSave = false;
Expand Down