From d44cce5c46c673835ec586495dd5f8ac4947d2b3 Mon Sep 17 00:00:00 2001
From: Ojas Anand <sigmaupsilon@users.noreply.github.com>
Date: Thu, 27 Feb 2020 21:21:27 -0500
Subject: [PATCH 1/3] Return keyboard focus after saving database edits (#4287)

---
 src/gui/DatabaseWidget.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index eb33c09c0b..990cf4e34f 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -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);
@@ -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;

From 8b539950ecf3d3e8351184b077da8863ccc9e25d Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Tue, 7 Jan 2020 17:56:34 -0500
Subject: [PATCH 2/3] Only use bare minimum settings for portable version

* Fixes #4103

* This ini file ensures the portable distribution populates with the default settings from the code and not from outdated ini file.
---
 share/keepassxc.ini | 72 +++++++--------------------------------------
 1 file changed, 10 insertions(+), 62 deletions(-)

diff --git a/share/keepassxc.ini b/share/keepassxc.ini
index d40572659e..ab450d485e 100644
--- a/share/keepassxc.ini
+++ b/share/keepassxc.ini
@@ -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

From d68975cf104625ae9d5de6c42e9e9f7f86414e4d Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Tue, 7 Jan 2020 16:34:40 -0500
Subject: [PATCH 3/3] Use SHA256 Digest for Code Signing on Windows

---
 release-tool | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release-tool b/release-tool
index 26fc7fae84..d449a1f4b3 100755
--- a/release-tool
+++ b/release-tool
@@ -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!"