From 2193e07582a8dcbfcded13e12a8a3e271a6effc4 Mon Sep 17 00:00:00 2001
From: Tomas Mizera <tomas.mizera@lutraconsulting.co.uk>
Date: Fri, 29 Nov 2024 14:32:52 +0100
Subject: [PATCH 1/3] Remove deprecated server validation use

---
 Mergin/utils.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Mergin/utils.py b/Mergin/utils.py
index 8e20d18c..f8e0a734 100644
--- a/Mergin/utils.py
+++ b/Mergin/utils.py
@@ -399,14 +399,13 @@ def send_logs(username, logfile):
 
 def validate_mergin_url(url):
     """
-    Validation of mergin URL by pinging. Checks if URL points at compatible Mergin server.
+    Initiates connection to the provided server URL to check if the server is accessible
     :param url: String Mergin Maps URL to ping.
     :return: String error message as result of validation. If None, URL is valid.
     """
     try:
-        mc = MerginClient(url, proxy_config=get_qgis_proxy_config(url))
-        if not mc.is_server_compatible():
-            return "Incompatible Mergin Maps server"
+        _ = MerginClient(url, proxy_config=get_qgis_proxy_config(url))
+
     # Valid but not Mergin URl
     except ClientError:
         return "Invalid Mergin Maps URL"
@@ -1223,7 +1222,7 @@ def test_server_connection(url, username, password):
     result = True, "<font color=green> OK </font>"
     proxy_config = get_qgis_proxy_config(url)
     try:
-        mc = MerginClient(url, None, username, password, get_plugin_version(), proxy_config)
+        _ = MerginClient(url, None, username, password, get_plugin_version(), proxy_config)
     except (LoginError, ClientError) as e:
         QgsApplication.messageLog().logMessage(f"Mergin Maps plugin: {str(e)}")
         result = False, f"<font color=red> Connection failed, {str(e)} </font>"

From 91286586ed8236b8ccf62f05c4a59bcb7344bfae Mon Sep 17 00:00:00 2001
From: Tomas Mizera <tomas.mizera@lutraconsulting.co.uk>
Date: Thu, 9 Jan 2025 11:53:06 +0100
Subject: [PATCH 2/3] Update Mergin/utils.py

Co-authored-by: Valentin Buira <30632058+ValentinBuira@users.noreply.github.com>
---
 Mergin/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mergin/utils.py b/Mergin/utils.py
index f8e0a734..655c2a78 100644
--- a/Mergin/utils.py
+++ b/Mergin/utils.py
@@ -404,7 +404,7 @@ def validate_mergin_url(url):
     :return: String error message as result of validation. If None, URL is valid.
     """
     try:
-        _ = MerginClient(url, proxy_config=get_qgis_proxy_config(url))
+        MerginClient(url, proxy_config=get_qgis_proxy_config(url))
 
     # Valid but not Mergin URl
     except ClientError:

From 4d37a0fae110ad278c217e44292bdf8e0d694fc7 Mon Sep 17 00:00:00 2001
From: Tomas Mizera <tomas.mizera@lutraconsulting.co.uk>
Date: Thu, 9 Jan 2025 11:54:04 +0100
Subject: [PATCH 3/3] Update utils.py

---
 Mergin/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mergin/utils.py b/Mergin/utils.py
index 655c2a78..88f2f07e 100644
--- a/Mergin/utils.py
+++ b/Mergin/utils.py
@@ -1222,7 +1222,7 @@ def test_server_connection(url, username, password):
     result = True, "<font color=green> OK </font>"
     proxy_config = get_qgis_proxy_config(url)
     try:
-        _ = MerginClient(url, None, username, password, get_plugin_version(), proxy_config)
+        MerginClient(url, None, username, password, get_plugin_version(), proxy_config)
     except (LoginError, ClientError) as e:
         QgsApplication.messageLog().logMessage(f"Mergin Maps plugin: {str(e)}")
         result = False, f"<font color=red> Connection failed, {str(e)} </font>"