Merge branch 'dev' into refactoring/android

client/ui/qml/Pages2/PageSettingsServerInfo.qml

@@ -102,6 +102,7 @@ PageType {
                             headerText: qsTr("Server name")
                             textFieldText: name
                             textField.maximumLength: 30
+                            checkEmptyText: true
                         }
 
                         BasicButtonType {
@@ -110,10 +111,14 @@ PageType {
                             text: qsTr("Save")
 
                             onClicked: {
+                                if (serverName.textFieldText === "") {
+                                    return
+                                }
+
                                 if (serverName.textFieldText !== name) {
                                     name = serverName.textFieldText
-                                    serverNameEditDrawer.visible = false
                                 }
+                                serverNameEditDrawer.visible = false
                             }
                         }
                     }

client/ui/qml/Pages2/PageShare.qml

@@ -261,6 +261,7 @@ PageType {
 
                 headerText: qsTr("User name")
                 textFieldText: "New client"
+                textField.maximumLength: 20
 
                 checkEmptyText: true
             }
@@ -469,9 +470,11 @@ PageType {
                 imageSource: "qrc:/images/controls/share-2.svg"
 
                 onClicked: {
+                    if (clientNameTextField.textFieldText !== "") {
                         ExportController.generateConfig(root.connectionTypesModel[exportTypeSelector.currentIndex].type)
                     }
                 }
+            }
 
             Header2Type {
                 Layout.fillWidth: true
@@ -623,7 +626,8 @@ PageType {
                                                 Layout.fillWidth: true
                                                 headerText: qsTr("Client name")
                                                 textFieldText: clientName
-                                                textField.maximumLength: 30
+                                                textField.maximumLength: 20
+                                                checkEmptyText: true
                                             }
 
                                             BasicButtonType {
@@ -632,6 +636,10 @@ PageType {
                                                 text: qsTr("Save")
 
                                                 onClicked: {
+                                                    if (clientNameEditor.textFieldText === "") {
+                                                        return
+                                                    }
+
                                                     if (clientNameEditor.textFieldText !== clientName) {
                                                         PageController.showBusyIndicator(true)
                                                         ExportController.renameClient(index,
@@ -660,7 +668,7 @@ PageType {
                                     text: qsTr("Revoke")
 
                                     onClicked: function() {
-                                        questionDrawer.headerText = qsTr("Revoke the config for a user - ") + clientName + "?"
+                                        questionDrawer.headerText = qsTr("Revoke the config for a user - %1?").arg(clientName)
                                         questionDrawer.descriptionText = qsTr("The user will no longer be able to connect to your server.")
                                         questionDrawer.yesButtonText = qsTr("Continue")
                                         questionDrawer.noButtonText = qsTr("Cancel")

client/ui/qml/Pages2/PageShareFullAccess.qml

@@ -90,8 +90,6 @@ PageType {
                         ]
                     }
 
-                    currentIndex: 0
-
                     clickedFunction: function() {
                         handler()
 
@@ -105,7 +103,9 @@ PageType {
                     }
 
                     Component.onCompleted: {
-                        handler()
+                        serverSelectorListView.currentIndex = ServersModel.isDefaultServerHasWriteAccess() ?
+                                    proxyServersModel.mapFromSource(ServersModel.defaultIndex) : 0
+                        serverSelectorListView.triggerCurrentItem()
                     }
 
                     function handler() {