From 4fed655621288df95c1ce974fedd487433d0f46c Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Sun, 9 Jul 2017 00:30:25 +0200
Subject: [PATCH 01/12] Fix PasswordGeneratorWidget sizes and size policies to
 avoid squished buttons

---
 src/gui/PasswordGeneratorWidget.ui   | 60 +---------------------------
 src/gui/entry/EditEntryWidgetMain.ui | 29 +-------------
 2 files changed, 3 insertions(+), 86 deletions(-)

diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui
index 0b143b89e..a04719c33 100644
--- a/src/gui/PasswordGeneratorWidget.ui
+++ b/src/gui/PasswordGeneratorWidget.ui
@@ -2,32 +2,12 @@
 <ui version="4.0">
  <class>PasswordGeneratorWidget</class>
  <widget class="QWidget" name="PasswordGeneratorWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>575</width>
-    <height>305</height>
-   </rect>
-  </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>284</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>16777215</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string/>
   </property>
@@ -188,17 +168,11 @@ QProgressBar::chunk {
      <item>
       <widget class="QTabWidget" name="tabWidget">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
        <property name="tabPosition">
         <enum>QTabWidget::North</enum>
        </property>
@@ -225,12 +199,6 @@ QProgressBar::chunk {
                <layout class="QHBoxLayout" name="alphabetLayout" stretch="0,0,0,0,1,0">
                 <item>
                  <widget class="QToolButton" name="checkBoxUpper">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Maximum" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <property name="minimumSize">
                    <size>
                     <width>0</width>
@@ -256,12 +224,6 @@ QProgressBar::chunk {
                 </item>
                 <item>
                  <widget class="QToolButton" name="checkBoxLower">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Maximum" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <property name="minimumSize">
                    <size>
                     <width>0</width>
@@ -287,12 +249,6 @@ QProgressBar::chunk {
                 </item>
                 <item>
                  <widget class="QToolButton" name="checkBoxNumbers">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Maximum" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <property name="minimumSize">
                    <size>
                     <width>0</width>
@@ -318,12 +274,6 @@ QProgressBar::chunk {
                 </item>
                 <item>
                  <widget class="QToolButton" name="checkBoxSpecialChars">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Maximum" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <property name="minimumSize">
                    <size>
                     <width>0</width>
@@ -349,12 +299,6 @@ QProgressBar::chunk {
                 </item>
                 <item>
                  <widget class="QToolButton" name="checkBoxExtASCII">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Maximum" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <property name="minimumSize">
                    <size>
                     <width>0</width>
@@ -578,7 +522,7 @@ QProgressBar::chunk {
              <item row="2" column="1">
               <widget class="QLineEdit" name="editWordSeparator">
                <property name="text">
-                <string> </string>
+                <string/>
                </property>
               </widget>
              </item>
diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui
index c22d4b8b1..afc1d4f26 100644
--- a/src/gui/entry/EditEntryWidgetMain.ui
+++ b/src/gui/entry/EditEntryWidgetMain.ui
@@ -2,20 +2,6 @@
 <ui version="4.0">
  <class>EditEntryWidgetMain</class>
  <widget class="QWidget" name="EditEntryWidgetMain">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>692</width>
-    <height>323</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <property name="topMargin">
     <number>0</number>
@@ -34,20 +20,7 @@
     </widget>
    </item>
    <item row="4" column="1">
-    <widget class="PasswordGeneratorWidget" name="passwordGenerator" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-    </widget>
+    <widget class="PasswordGeneratorWidget" name="passwordGenerator" native="true"/>
    </item>
    <item row="2" column="0" alignment="Qt::AlignRight">
     <widget class="QLabel" name="passwordLabel">

From 32100be47acfdccc07dddb54b19a4ad4362058a6 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Sun, 16 Jul 2017 14:49:15 -0400
Subject: [PATCH 02/12] change help accesskey to h

---
 src/gui/MainWindow.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index 2ed42d0ec..5b4b16981 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -200,7 +200,7 @@
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
-     <string>He&amp;lp</string>
+     <string>&amp;Help</string>
     </property>
     <addaction name="actionAbout"/>
    </widget>

From 98c812a29730c5abc70db1526ec3066487bf2ad0 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Sun, 16 Jul 2017 15:09:42 -0400
Subject: [PATCH 03/12] Set up is used as a verb phrase not a noun

---
 src/gui/MainWindow.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index 5b4b16981..f53b7d0cf 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -542,7 +542,7 @@
   </action>
   <action name="actionEntrySetupTotp">
    <property name="text">
-    <string>Setup TOTP</string>
+    <string>Set up TOTP</string>
    </property>
   </action>
   <action name="actionEntryCopyTotp">

From 35c6df2535c784bd4e0aaa91606b7bcbb5afa67c Mon Sep 17 00:00:00 2001
From: thez3ro <io@thezero.org>
Date: Thu, 29 Jun 2017 19:54:49 +0200
Subject: [PATCH 04/12] resolve URL for correct favicon downloading, fixes #240
 #238

---
 src/core/Entry.cpp                | 25 +++++++++++++++++++++++++
 src/core/Entry.h                  |  2 ++
 src/gui/EditWidgetIcons.cpp       | 11 +++++++++--
 src/gui/entry/EditEntryWidget.cpp |  2 +-
 src/http/Service.cpp              |  2 +-
 tests/CMakeLists.txt              |  2 +-
 6 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index a8cc6d3b7..831661e7f 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -237,6 +237,11 @@ QString Entry::url() const
     return m_attributes->value(EntryAttributes::URLKey);
 }
 
+QString Entry::webUrl() const
+{
+    return resolveUrl(m_attributes->value(EntryAttributes::URLKey));
+}
+
 QString Entry::username() const
 {
     return m_attributes->value(EntryAttributes::UserNameKey);
@@ -784,3 +789,23 @@ QString Entry::resolvePlaceholder(const QString& str) const
 
     return result;
 }
+
+QString Entry::resolveUrl(const QString& url) const
+{
+    QString newurl = url;
+    if (!url.contains("://")) {
+        // URL doesn't have a protocol, add https by default
+        newurl.prepend("https://");
+    }
+    QUrl uurl = QUrl(newurl);
+
+    if(uurl.scheme() == "cmd") {
+        // URL is a cmd, hopefully the second argument it's an URL
+        QStringList cmd = newurl.split(" ");
+        return resolveUrl(cmd[1].remove("'").remove("\""));
+    } else if(uurl.scheme() != "http" && uurl.scheme() != "https") {
+        // URL isn't very nice
+        return QString("");
+    }
+    return uurl.url();
+}
\ No newline at end of file
diff --git a/src/core/Entry.h b/src/core/Entry.h
index 91a0012a1..889a9334e 100644
--- a/src/core/Entry.h
+++ b/src/core/Entry.h
@@ -78,6 +78,7 @@ public:
     const AutoTypeAssociations* autoTypeAssociations() const;
     QString title() const;
     QString url() const;
+    QString webUrl() const;
     QString username() const;
     QString password() const;
     QString notes() const;
@@ -143,6 +144,7 @@ public:
     void copyDataFrom(const Entry* other);
     QString resolveMultiplePlaceholders(const QString& str) const;
     QString resolvePlaceholder(const QString& str) const;
+    QString resolveUrl(const QString& url) const;
 
     /**
      * Call before and after set*() methods to create a history item
diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index 42bc507dd..e2c75c962 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -223,8 +223,15 @@ void EditWidgetIcons::fetchFavicon(const QUrl& url)
     }
 
     m_httpClient->setConnectingTimeOut(5000, [this]() {
-        resetFaviconDownload();
-        MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon."));
+        QUrl tempurl = QUrl(m_url);
+        if (tempurl.scheme() == "http") {
+            resetFaviconDownload();
+            MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon."));
+        } else {
+            tempurl.setScheme("http");
+            tempurl.setPath("/favicon.ico");
+            fetchFavicon(tempurl);
+        }
     });
 
     m_ui->faviconButton->setDisabled(true);
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index 2561564c5..bea10b995 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -363,7 +363,7 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore)
     IconStruct iconStruct;
     iconStruct.uuid = entry->iconUuid();
     iconStruct.number = entry->iconNumber();
-    m_iconsWidget->load(entry->uuid(), m_database, iconStruct, entry->url());
+    m_iconsWidget->load(entry->uuid(), m_database, iconStruct, entry->webUrl());
     connect(m_mainUi->urlEdit, SIGNAL(textChanged(QString)), m_iconsWidget, SLOT(setUrl(QString)));
 
     m_autoTypeUi->enableButton->setChecked(entry->autoTypeEnabled());
diff --git a/src/http/Service.cpp b/src/http/Service.cpp
index 639898da2..768a5774d 100644
--- a/src/http/Service.cpp
+++ b/src/http/Service.cpp
@@ -203,7 +203,7 @@ QList<Entry*> Service::searchEntries(Database* db, const QString& hostname)
         const auto results = EntrySearcher().search(hostname, rootGroup, Qt::CaseInsensitive);
         for (Entry* entry: results) {
             QString title = entry->title();
-            QString url = entry->url();
+            QString url = entry->webUrl();
 
             //Filter to match hostname in Title and Url fields
             if (   (!title.isEmpty() && hostname.contains(title))
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 67661f55c..2a420270a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -98,7 +98,7 @@ set(TEST_LIBRARIES
 
 set(testsupport_SOURCES modeltest.cpp FailDevice.cpp)
 add_library(testsupport STATIC ${testsupport_SOURCES})
-target_link_libraries(testsupport ${MHD_LIBRARIES} Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Test)
+target_link_libraries(testsupport Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Test)
 
 if(YUBIKEY_FOUND)
   set(TEST_LIBRARIES ${TEST_LIBRARIES} ${YUBIKEY_LIBRARIES})

From bb50db40d28cf261722e5f4910da0a8ef6af0a27 Mon Sep 17 00:00:00 2001
From: thez3ro <io@thezero.org>
Date: Sat, 1 Jul 2017 14:51:20 +0200
Subject: [PATCH 05/12] resolve URL only with HTTP enabled

---
 src/core/Entry.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index 831661e7f..ec80ff293 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -17,6 +17,8 @@
  */
 #include "Entry.h"
 
+#include "config-keepassx.h"
+
 #include "core/Database.h"
 #include "core/DatabaseIcons.h"
 #include "core/Group.h"
@@ -792,6 +794,7 @@ QString Entry::resolvePlaceholder(const QString& str) const
 
 QString Entry::resolveUrl(const QString& url) const
 {
+#ifdef WITH_XC_HTTP
     QString newurl = url;
     if (!url.contains("://")) {
         // URL doesn't have a protocol, add https by default
@@ -802,10 +805,15 @@ QString Entry::resolveUrl(const QString& url) const
     if(uurl.scheme() == "cmd") {
         // URL is a cmd, hopefully the second argument it's an URL
         QStringList cmd = newurl.split(" ");
-        return resolveUrl(cmd[1].remove("'").remove("\""));
-    } else if(uurl.scheme() != "http" && uurl.scheme() != "https") {
-        // URL isn't very nice
-        return QString("");
+        if (cmd.size() > 1) {
+            return resolveUrl(cmd[1].remove("'").remove("\""));
+        }
+    } else if(uurl.scheme() == "http" || uurl.scheme() == "https") {
+        // URL is nice
+        return uurl.url();
     }
-    return uurl.url();
+#else
+    Q_UNUSED(url);
+#endif
+    return QString("");
 }
\ No newline at end of file

From 9ceadac2994e3c4a4ab704f9a6efcb7405aab56e Mon Sep 17 00:00:00 2001
From: thez3ro <io@thezero.org>
Date: Sun, 2 Jul 2017 11:39:52 +0200
Subject: [PATCH 06/12] fix google favicon download over https

---
 src/core/Entry.cpp          | 6 +++---
 src/gui/EditWidgetIcons.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index ec80ff293..cb4c8cff8 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -802,13 +802,13 @@ QString Entry::resolveUrl(const QString& url) const
     }
     QUrl uurl = QUrl(newurl);
 
-    if(uurl.scheme() == "cmd") {
-        // URL is a cmd, hopefully the second argument it's an URL
+    if (uurl.scheme() == "cmd") {
+        // URL is a cmd, hopefully the second argument is an URL
         QStringList cmd = newurl.split(" ");
         if (cmd.size() > 1) {
             return resolveUrl(cmd[1].remove("'").remove("\""));
         }
-    } else if(uurl.scheme() == "http" || uurl.scheme() == "https") {
+    } else if (uurl.scheme() == "http" || uurl.scheme() == "https") {
         // URL is nice
         return uurl.url();
     }
diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index e2c75c962..55bfae673 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -242,7 +242,7 @@ void EditWidgetIcons::fetchFaviconFromGoogle(const QString& domain)
     if (config()->get("security/IconDownloadFallbackToGoogle", false).toBool() && m_fallbackToGoogle) {
         resetFaviconDownload();
         m_fallbackToGoogle = false;
-        fetchFavicon(QUrl("http://www.google.com/s2/favicons?domain=" + domain));
+        fetchFavicon(QUrl("https://www.google.com/s2/favicons?domain=" + domain));
     } else {
         resetFaviconDownload();
         MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon."));

From a888de19cd85269d9cfe0d1d7edcc9d94a23538c Mon Sep 17 00:00:00 2001
From: thez3ro <io@thezero.org>
Date: Mon, 3 Jul 2017 15:40:05 +0200
Subject: [PATCH 07/12] update m_url scheme after fallback to http

---
 src/gui/EditWidgetIcons.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index 55bfae673..b29699342 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -229,6 +229,7 @@ void EditWidgetIcons::fetchFavicon(const QUrl& url)
             MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon."));
         } else {
             tempurl.setScheme("http");
+            m_url = tempurl.url();
             tempurl.setPath("/favicon.ico");
             fetchFavicon(tempurl);
         }

From 691e60d72bbbea6211a36d079fd041080a28159a Mon Sep 17 00:00:00 2001
From: thez3ro <io@thezero.org>
Date: Thu, 13 Jul 2017 23:10:15 +0200
Subject: [PATCH 08/12] check if url is valid

---
 src/core/Entry.cpp          | 24 +++++++++++++-----------
 src/gui/EditWidgetIcons.cpp |  6 ++++--
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index cb4c8cff8..267c9ad2b 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -795,22 +795,24 @@ QString Entry::resolvePlaceholder(const QString& str) const
 QString Entry::resolveUrl(const QString& url) const
 {
 #ifdef WITH_XC_HTTP
-    QString newurl = url;
+    QString newUrl = url;
     if (!url.contains("://")) {
         // URL doesn't have a protocol, add https by default
-        newurl.prepend("https://");
+        newUrl.prepend("https://");
     }
-    QUrl uurl = QUrl(newurl);
+    QUrl tempUrl = QUrl(newUrl);
 
-    if (uurl.scheme() == "cmd") {
-        // URL is a cmd, hopefully the second argument is an URL
-        QStringList cmd = newurl.split(" ");
-        if (cmd.size() > 1) {
-            return resolveUrl(cmd[1].remove("'").remove("\""));
+    if (tempUrl.isValid()) {
+        if (tempUrl.scheme() == "cmd") {
+            // URL is a cmd, hopefully the second argument is an URL
+            QStringList cmd = newUrl.split(" ");
+            if (cmd.size() > 1) {
+                return resolveUrl(cmd[1].remove("'").remove("\""));
+            }
+        } else if (tempUrl.scheme() == "http" || tempUrl.scheme() == "https") {
+            // URL is nice
+            return tempUrl.url();
         }
-    } else if (uurl.scheme() == "http" || uurl.scheme() == "https") {
-        // URL is nice
-        return uurl.url();
     }
 #else
     Q_UNUSED(url);
diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index b29699342..4c4c35c4b 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -226,7 +226,7 @@ void EditWidgetIcons::fetchFavicon(const QUrl& url)
         QUrl tempurl = QUrl(m_url);
         if (tempurl.scheme() == "http") {
             resetFaviconDownload();
-            MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon."));
+            MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon.") + "\n" + tr("Hint: You can enable Google as a fallback under Tools>Settings>Security"));
         } else {
             tempurl.setScheme("http");
             m_url = tempurl.url();
@@ -243,7 +243,9 @@ void EditWidgetIcons::fetchFaviconFromGoogle(const QString& domain)
     if (config()->get("security/IconDownloadFallbackToGoogle", false).toBool() && m_fallbackToGoogle) {
         resetFaviconDownload();
         m_fallbackToGoogle = false;
-        fetchFavicon(QUrl("https://www.google.com/s2/favicons?domain=" + domain));
+        QUrl faviconUrl = QUrl("https://www.google.com/s2/favicons");
+        faviconUrl.setQuery("domain=" + domain);
+        fetchFavicon(faviconUrl);
     } else {
         resetFaviconDownload();
         MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon."));

From 8ed8e57012348d61234e3af6f8548e6589877c49 Mon Sep 17 00:00:00 2001
From: thez3ro <io@thezero.org>
Date: Mon, 17 Jul 2017 21:47:53 +0200
Subject: [PATCH 09/12] use percentEncoding for url query

---
 src/gui/EditWidgetIcons.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index 4c4c35c4b..1ab9dfe4a 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -244,7 +244,7 @@ void EditWidgetIcons::fetchFaviconFromGoogle(const QString& domain)
         resetFaviconDownload();
         m_fallbackToGoogle = false;
         QUrl faviconUrl = QUrl("https://www.google.com/s2/favicons");
-        faviconUrl.setQuery("domain=" + domain);
+        faviconUrl.setQuery("domain=" + QUrl::toPercentEncoding(domain));
         fetchFavicon(faviconUrl);
     } else {
         resetFaviconDownload();

From cdad46377ba4cc9ccd8d5a151f1c16ec0780984c Mon Sep 17 00:00:00 2001
From: thez3ro <io@thezero.org>
Date: Tue, 18 Jul 2017 19:17:14 +0200
Subject: [PATCH 10/12] Fix Single Istance behavior

---
 LICENSE.APACHE-2.0               | 201 +++++++++++++++++++++++++++++++
 src/core/Config.cpp              |   1 +
 src/gui/Application.cpp          |  25 ++--
 src/gui/SettingsWidget.cpp       |   5 +
 src/gui/SettingsWidgetGeneral.ui |  10 ++
 src/main.cpp                     |   4 +-
 6 files changed, 236 insertions(+), 10 deletions(-)
 create mode 100644 LICENSE.APACHE-2.0

diff --git a/LICENSE.APACHE-2.0 b/LICENSE.APACHE-2.0
new file mode 100644
index 000000000..9c8f3ea08
--- /dev/null
+++ b/LICENSE.APACHE-2.0
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/src/core/Config.cpp b/src/core/Config.cpp
index 434df934c..e4776edee 100644
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -107,6 +107,7 @@ void Config::init(const QString& fileName)
 {
     m_settings.reset(new QSettings(fileName, QSettings::IniFormat));
 
+    m_defaults.insert("SingleInstance", true);
     m_defaults.insert("RememberLastDatabases", true);
     m_defaults.insert("RememberLastKeyFiles", true);
     m_defaults.insert("OpenPreviousDatabasesOnStartup", true);
diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp
index 7c369cf1c..d653e23bc 100644
--- a/src/gui/Application.cpp
+++ b/src/gui/Application.cpp
@@ -19,6 +19,7 @@
 
 #include "Application.h"
 #include "MainWindow.h"
+#include "core/Config.h"
 
 #include <QAbstractNativeEventFilter>
 #include <QFileOpenEvent>
@@ -100,6 +101,10 @@ Application::Application(int& argc, char** argv)
     if (!userName.isEmpty()) {
         identifier.append("-");
         identifier.append(userName);
+#ifdef QT_DEBUG
+        // In DEBUG mode don't interfere with Release instances 
+        identifier.append("-DEBUG");
+#endif
     }
     QString socketName = identifier + ".socket";
     QString lockName = identifier + ".lock";
@@ -119,12 +124,14 @@ Application::Application(int& argc, char** argv)
         alreadyRunning = true;
         // notify the other instance
         // try several times, in case the other instance is still starting up
-        QLocalSocket client;
-        for (int i = 0; i < 3; i++) {
-            client.connectToServer(socketName);
-            if (client.waitForConnected(150)) {
-                client.abort();
-                break;
+        if (config()->get("SingleInstance").toBool()) {
+            QLocalSocket client;
+            for (int i = 0; i < 3; i++) {
+                client.connectToServer(socketName);
+                if (client.waitForConnected(150)) {
+                    client.abort();
+                    break;
+                }
             }
         }
         break;
@@ -232,6 +239,10 @@ void Application::quitBySignal()
 
 bool Application::isAlreadyRunning() const
 {
-    return alreadyRunning;
+#ifdef QT_DEBUG
+    // In DEBUG mode we can run unlimited instances
+    return false;
+#endif
+    return config()->get("SingleInstance").toBool() && alreadyRunning;
 }
 
diff --git a/src/gui/SettingsWidget.cpp b/src/gui/SettingsWidget.cpp
index b145cd7c8..af9a77930 100644
--- a/src/gui/SettingsWidget.cpp
+++ b/src/gui/SettingsWidget.cpp
@@ -107,6 +107,10 @@ void SettingsWidget::loadSettings()
             tr("Access error for config file %1").arg(config()->getFileName()), MessageWidget::Error);
     }
 
+#ifdef QT_DEBUG
+    m_generalUi->singleInstanceCheckBox->setEnabled(false);
+#endif
+    m_generalUi->singleInstanceCheckBox->setChecked(config()->get("SingleInstance").toBool());
     m_generalUi->rememberLastDatabasesCheckBox->setChecked(config()->get("RememberLastDatabases").toBool());
     m_generalUi->rememberLastKeyFilesCheckBox->setChecked(config()->get("RememberLastKeyFiles").toBool());
     m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked(
@@ -176,6 +180,7 @@ void SettingsWidget::saveSettings()
         return;
     }
 
+    config()->set("SingleInstance", m_generalUi->singleInstanceCheckBox->isChecked());
     config()->set("RememberLastDatabases", m_generalUi->rememberLastDatabasesCheckBox->isChecked());
     config()->set("RememberLastKeyFiles", m_generalUi->rememberLastKeyFilesCheckBox->isChecked());
     config()->set("OpenPreviousDatabasesOnStartup",
diff --git a/src/gui/SettingsWidgetGeneral.ui b/src/gui/SettingsWidgetGeneral.ui
index ac7f28267..c35440cd4 100644
--- a/src/gui/SettingsWidgetGeneral.ui
+++ b/src/gui/SettingsWidgetGeneral.ui
@@ -33,6 +33,16 @@
        <string>Basic Settings</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QCheckBox" name="singleInstanceCheckBox">
+         <property name="text">
+          <string>Start only a single instance of KeePassXC</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QCheckBox" name="rememberLastDatabasesCheckBox">
          <property name="text">
diff --git a/src/main.cpp b/src/main.cpp
index 7c4402b99..2018d29ea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -57,13 +57,11 @@ int main(int argc, char** argv)
     // don't set organizationName as that changes the return value of
     // QStandardPaths::writableLocation(QDesktopServices::DataLocation)
 
-#ifndef QT_DEBUG
     if (app.isAlreadyRunning()) {
         qWarning() << QCoreApplication::translate("Main", "Another instance of KeePassXC is already running.").toUtf8().constData();
         return 0;
     }
-#endif
-
+    
     QApplication::setQuitOnLastWindowClosed(false);
 
     if (!Crypto::init()) {

From c0f668c4bbcf649a359e763004145248cbfde6c4 Mon Sep 17 00:00:00 2001
From: Markus Napp <mnapp@arago.de>
Date: Thu, 20 Jul 2017 13:57:21 +0200
Subject: [PATCH 11/12] Fix clone dialog text

---
 src/gui/CloneDialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/CloneDialog.ui b/src/gui/CloneDialog.ui
index 142b17b99..16ca3e6d1 100644
--- a/src/gui/CloneDialog.ui
+++ b/src/gui/CloneDialog.ui
@@ -19,7 +19,7 @@
      <item>
       <widget class="QCheckBox" name="titleClone">
        <property name="text">
-        <string>Append ' - Copy' to title</string>
+        <string>Append ' - Clone' to title</string>
        </property>
        <property name="checked">
         <bool>true</bool>

From f71d0c0da8ce64fd3fb2ee54c5bc040add4ca975 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Sun, 16 Jul 2017 15:35:23 -0400
Subject: [PATCH 12/12] Add ellipsis

The rule for ellipsis is simple:
If the described action requires interruption (typically by a dialog)
which requires user input, then ellipsis should be used to indicate
that triggering the menu will not immediately trigger the desired action.

Examples:
"Save" does not need an ellipsis in general (when the file name is known)
"Open..." needs an ellipsis, as one must select a file to open.
"Save as..." needs an ellipsis, as in order to save the file as something,
one must select a file name.
"About" does not need an ellipsis, while it may open a dialog, that dialog
is the desired result.
---
 src/format/KeePass2Reader.cpp |  2 +-
 src/gui/MainWindow.ui         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/format/KeePass2Reader.cpp b/src/format/KeePass2Reader.cpp
index b0d780724..bb737beda 100644
--- a/src/format/KeePass2Reader.cpp
+++ b/src/format/KeePass2Reader.cpp
@@ -73,7 +73,7 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke
     quint32 signature2 = Endian::readUInt32(m_headerStream, KeePass2::BYTEORDER, &ok);
     if (ok && signature2 == KeePass1::SIGNATURE_2) {
         raiseError(tr("The selected file is an old KeePass 1 database (.kdb).\n\n"
-                      "You can import it by clicking on Database > 'Import KeePass 1 database'.\n"
+                      "You can import it by clicking on Database > 'Import KeePass 1 database...'.\n"
                       "This is a one-way migration. You won't be able to open the imported "
                       "database with the old KeePassX 0.4 version."));
         return nullptr;
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index f53b7d0cf..5991077f5 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -309,7 +309,7 @@
   </action>
   <action name="actionDatabaseOpen">
    <property name="text">
-    <string>&amp;Open database</string>
+    <string>&amp;Open database...</string>
    </property>
   </action>
   <action name="actionDatabaseSave">
@@ -391,7 +391,7 @@
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>Sa&amp;ve database as</string>
+    <string>Sa&amp;ve database as...</string>
    </property>
   </action>
   <action name="actionChangeMasterKey">
@@ -399,7 +399,7 @@
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>Change &amp;master key</string>
+    <string>Change &amp;master key...</string>
    </property>
   </action>
   <action name="actionChangeDatabaseSettings">
@@ -517,22 +517,22 @@
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>&amp;Export to CSV file</string>
+    <string>&amp;Export to CSV file...</string>
    </property>
   </action>
   <action name="actionImportKeePass1">
    <property name="text">
-    <string>Import KeePass 1 database</string>
+    <string>Import KeePass 1 database...</string>
    </property>
   </action>
   <action name="actionImportCsv">
    <property name="text">
-    <string>Import CSV file</string>
+    <string>Import CSV file...</string>
    </property>
   </action>
   <action name="actionRepairDatabase">
    <property name="text">
-    <string>Re&amp;pair database</string>
+    <string>Re&amp;pair database...</string>
    </property>
   </action>
   <action name="actionEntryTotp">
@@ -542,7 +542,7 @@
   </action>
   <action name="actionEntrySetupTotp">
    <property name="text">
-    <string>Set up TOTP</string>
+    <string>Set up TOTP...</string>
    </property>
   </action>
   <action name="actionEntryCopyTotp">