mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-08-06 15:57:14 +03:00
Compare commits
1 Commits
dev
...
fix/ssh-cr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db054b2449 |
@@ -567,12 +567,12 @@ void InstallUiController::clearProcessedServerCredentials()
|
||||
|
||||
void InstallUiController::setProcessedServerCredentials(const QString &hostName, const QString &userName, const QString &secretData)
|
||||
{
|
||||
m_processedServerCredentials.hostName = hostName;
|
||||
m_processedServerCredentials.hostName = hostName.trimmed();
|
||||
if (m_processedServerCredentials.hostName.contains(":")) {
|
||||
m_processedServerCredentials.port = m_processedServerCredentials.hostName.split(":").at(1).toInt();
|
||||
m_processedServerCredentials.hostName = m_processedServerCredentials.hostName.split(":").at(0);
|
||||
}
|
||||
m_processedServerCredentials.userName = userName;
|
||||
m_processedServerCredentials.userName = userName.trimmed();
|
||||
m_processedServerCredentials.secretData = secretData;
|
||||
}
|
||||
|
||||
|
||||
@@ -65,15 +65,18 @@ PageType {
|
||||
headerText: title
|
||||
textField.echoMode: hideContent ? TextInput.Password : TextInput.Normal
|
||||
textField.placeholderText: placeholderContent
|
||||
textField.text: textField.text
|
||||
|
||||
rightButtonClickedOnEnter: true
|
||||
rightButtonClickedOnEnter: false
|
||||
|
||||
clickedFunc: function () {
|
||||
clickedHandler()
|
||||
buttonImageSource = textField.text !== "" ? imageSource : ""
|
||||
if (clickedHandler) {
|
||||
clickedHandler()
|
||||
buttonImageSource = textField.text !== "" ? imageSource : ""
|
||||
}
|
||||
}
|
||||
|
||||
textField.onAccepted: root.submit()
|
||||
|
||||
textField.onFocusChanged: {
|
||||
textField.text = textField.text.replace(/^\s+|\s+$/g, '')
|
||||
}
|
||||
@@ -112,25 +115,7 @@ PageType {
|
||||
text: qsTr("Continue")
|
||||
|
||||
clickedFunc: function() {
|
||||
if (!root.isCredentialsFilled()) {
|
||||
return
|
||||
}
|
||||
|
||||
var _hostname = listView.itemAtIndex(vars.hostnameIndex).children[0].textField.text
|
||||
var _username = listView.itemAtIndex(vars.usernameIndex).children[0].textField.text
|
||||
var _secretData = listView.itemAtIndex(vars.secretDataIndex).children[0].textField.text
|
||||
|
||||
InstallController.setProcessedServerCredentials(_hostname, _username, _secretData)
|
||||
ServersUiController.setProcessedServerId("")
|
||||
|
||||
PageController.showBusyIndicator(true)
|
||||
var isConnectionOpened = InstallController.checkSshConnection()
|
||||
PageController.showBusyIndicator(false)
|
||||
if (!isConnectionOpened) {
|
||||
return
|
||||
}
|
||||
|
||||
PageController.goToPage(PageEnum.PageSetupWizardEasy)
|
||||
root.submit()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -168,6 +153,28 @@ PageType {
|
||||
}
|
||||
}
|
||||
|
||||
function submit() {
|
||||
if (!root.isCredentialsFilled()) {
|
||||
return
|
||||
}
|
||||
|
||||
var _hostname = listView.itemAtIndex(vars.hostnameIndex).children[0].textField.text
|
||||
var _username = listView.itemAtIndex(vars.usernameIndex).children[0].textField.text
|
||||
var _secretData = listView.itemAtIndex(vars.secretDataIndex).children[0].textField.text
|
||||
|
||||
InstallController.setProcessedServerCredentials(_hostname, _username, _secretData)
|
||||
ServersUiController.setProcessedServerId("")
|
||||
|
||||
PageController.showBusyIndicator(true)
|
||||
var isConnectionOpened = InstallController.checkSshConnection()
|
||||
PageController.showBusyIndicator(false)
|
||||
if (!isConnectionOpened) {
|
||||
return
|
||||
}
|
||||
|
||||
PageController.goToPage(PageEnum.PageSetupWizardEasy)
|
||||
}
|
||||
|
||||
function isCredentialsFilled() {
|
||||
var hasEmptyField = false
|
||||
|
||||
|
||||
Reference in New Issue
Block a user