From 015b209412b1176a6594a6ae4629b2039e91a8cc Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Sun, 28 Mar 2021 19:15:54 +0300
Subject: [PATCH 1/2] Fix version error message on options page

---
 keepassxc-browser/options/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js
index 40c1885..710d54c 100644
--- a/keepassxc-browser/options/options.js
+++ b/keepassxc-browser/options/options.js
@@ -276,7 +276,7 @@ options.showKeePassXCVersions = function(response) {
     $('#tab-about span.kpxcVersion').text(response.current);
     $('#tab-general-settings button.checkUpdateKeePassXC:first').attr('disabled', false);
 
-    if (response.current.startsWith('2.6') || response.current === '2.5.3-snapshot') {
+    if (response.current.startsWith('2.6') || response.current.includes('snapshot')) {
         $('#tab-general-settings #versionRequiredAlert').hide();
     } else {
         $('#tab-general-settings #showGroupNameInAutocomplete').attr('disabled', true);

From b1faeddbd851db85a377176826fc1f9a18e4ebdf Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Sun, 28 Mar 2021 20:46:52 +0300
Subject: [PATCH 2/2] Compare versions properly

---
 keepassxc-browser/background/event.js | 5 +++++
 keepassxc-browser/options/options.js  | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js
index 986935a..f3b5ab7 100755
--- a/keepassxc-browser/background/event.js
+++ b/keepassxc-browser/background/event.js
@@ -194,12 +194,17 @@ kpxcEvent.pageClearLogins = async function(tab, alreadyCalled) {
     }
 };
 
+kpxcEvent.compareVersion = async function(tab, args = []) {
+    return keepass.compareVersion(args[0], args[1]);
+};
+
 // All methods named in this object have to be declared BEFORE this!
 kpxcEvent.messageHandlers = {
     'add_credentials': keepass.addCredentials,
     'associate': keepass.associate,
     'check_database_hash': keepass.checkDatabaseHash,
     'check_update_keepassxc': kpxcEvent.onCheckUpdateKeePassXC,
+    'compare_version': kpxcEvent.compareVersion,
     'create_new_group': keepass.createNewGroup,
     'enable_automatic_reconnect': keepass.enableAutomaticReconnect,
     'disable_automatic_reconnect': keepass.disableAutomaticReconnect,
diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js
index 710d54c..effe288 100644
--- a/keepassxc-browser/options/options.js
+++ b/keepassxc-browser/options/options.js
@@ -263,7 +263,7 @@ options.initGeneralSettings = function() {
     }
 };
 
-options.showKeePassXCVersions = function(response) {
+options.showKeePassXCVersions = async function(response) {
     if (response.current === '') {
         response.current = 'unknown';
     }
@@ -276,7 +276,12 @@ options.showKeePassXCVersions = function(response) {
     $('#tab-about span.kpxcVersion').text(response.current);
     $('#tab-general-settings button.checkUpdateKeePassXC:first').attr('disabled', false);
 
-    if (response.current.startsWith('2.6') || response.current.includes('snapshot')) {
+    const result = await browser.runtime.sendMessage({
+        action: 'compare_version',
+        args: [ '2.6.0', response.current ]
+    });
+
+    if (result) {
         $('#tab-general-settings #versionRequiredAlert').hide();
     } else {
         $('#tab-general-settings #showGroupNameInAutocomplete').attr('disabled', true);