From 219c2fff7b95f788d3d8d0932c4f8a38e674c13a Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <andrea@scarpino.dev>
Date: Fri, 25 Nov 2022 22:16:33 +0100
Subject: [PATCH] Accept single URLs (hostname only) as valid

---
 qml/pages/LoginDialog.qml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/qml/pages/LoginDialog.qml b/qml/pages/LoginDialog.qml
index dc19440..c2ee3ac 100644
--- a/qml/pages/LoginDialog.qml
+++ b/qml/pages/LoginDialog.qml
@@ -71,15 +71,13 @@ Dialog {
 
             TextField {
                 id: serverField
-                // regExp combined from https://stackoverflow.com/a/3809435 (EDIT: removed ? after https to force SSL) and https://www.regextester.com/22
-                property var encryptedRegEx: /^https:\/\/(((www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b|((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))))([-a-zA-Z0-9@:%_\+.~#?&//=]*)$/
-                property var unencryptedRegEx : /^https?:\/\/(((www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b|((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))))([-a-zA-Z0-9@:%_\+.~#?&//=]*)$/
+                property var httpRegEx: /^https?:\/\/.+$/
                 width: parent.width
                 text: account.value("server", "https://", String)
                 placeholderText: qsTr("Nextcloud server")
                 label: placeholderText + " " + qsTr("(starting with \"https://\")")
                 inputMethodHints: Qt.ImhUrlCharactersOnly
-                validator: RegExpValidator { regExp: unencryptedConnectionTextSwitch.checked ? serverField.unencryptedRegEx : serverField.encryptedRegEx }
+                validator: RegExpValidator { regExp: httpRegEx }
                 errorHighlight: !acceptableInput// && focus === true
                 EnterKey.enabled: acceptableInput
                 EnterKey.iconSource: "image://theme/icon-m-enter-next"