Merge branch 'dev' into check_sudo_permissions (#1441)
* refactoring: improved the performance of secure_settings * bugfix: fixed textFields on PageSetupWizardCredentials * bugfix: fixed scrolling by keys on PageSettingsApiServerInfo * chore: hide site links for ios (#1374) * chore: fixed log output with split tunneling info * chore: hide "open logs folder" button for mobule platforms * chore: fixed again log output with split tunneling info * chore: bump version * Install apparmor (#1379) Install apparmor * chore: returned the backup page for androidTV * Enable PFS for Windows IKEv2 * refactoring: moved api info pages from ServerInfo * refactoring: moved gateway interaction functions to a separate class * bugfix: fixed storeEndpoint parsing * chore: returned links for mobile platforms * Update VPN protocol descriptions * Update VPN description texts * feature: added pages for subscription settings feature * feature: added page for export api native configs * feature: added error handling and minor ui fixes * refactor: update ios build configuration to use automatic code signing and prebuilt OpenVPNAdapter framework * feat: remove OpenVPNAdapter submodule * feat: remove ios openvpn script and associated cmake configuration * Update README.md * Update README_RU.md * Update README.md fix link * feature: added share vpn key to subscription settings page * bugfix: fixed possible crush on android * add timeouts in ipc client init * apply timeouts only for Windows * apply format to file * refactoring: simplified the validity check of the config before connection - improved project structure * bugfix: fixed visability of share drawer * feature: added 409 error handling from server response * chore: fixed android build * chore: fixed qr code display * Rewrite timeouts using waitForSource * feature: added error messages handler * feature: added issued configs info parsing * feature: added functionality to revoke api configs * chore: added links to instructions * chore: fixed qr code with vpnkey processing * chore: fixed native config post processing * chore: added link to android tv instruction * change node to IpcProcessTun2SocksReplica * chore: minor ui fixes * Update Windows OpenSSL (#1426) * Update Windows OpenSSL to 3.0.16 and add shared library for QSslSocket plugin * chore: update link to submodule 3rd-prebuild --------- Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com> * chore: added 404 handling for revoke configs - added revoke before remove api server for premium v2 * chore: added log to see proxy decrypt errors * chore: minor ui fix * chore: bump version * bugfix: fixed mobile controllers initialization (#1436) * bugfix: fixed mobile controllers initialization * chore: bump version * Merge pull request #1440 from amnezia-vpn/feature/subscription-settings-page feature/subscription settings page --------- Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com> Co-authored-by: pokamest <pokamest@gmail.com> Co-authored-by: Mykola Baibuz <mykola.baibuz@gmail.com> Co-authored-by: Yaroslav Yashin <yaroslav.yashin@gmail.com> Co-authored-by: KsZnak <ksu@amnezia.org> Co-authored-by: Cyril Anisimov <CyAn84@gmail.com>
This commit is contained in:
lunardunno
GitHub
parent
64552d6080
commit
059257fc58
110 changed files with 4168 additions and 2156 deletions
|
|
@ -82,24 +82,19 @@ PageType {
|
|||
reuseItems: true
|
||||
|
||||
delegate: ColumnLayout {
|
||||
property alias textField: _textField.textField
|
||||
|
||||
width: listView.width
|
||||
|
||||
TextFieldWithHeaderType {
|
||||
id: _textField
|
||||
id: delegate
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.leftMargin: 16
|
||||
Layout.rightMargin: 16
|
||||
|
||||
property bool hidePassword: hideText
|
||||
|
||||
headerText: title
|
||||
textField.echoMode: hideText ? TextInput.Password : TextInput.Normal
|
||||
buttonImageSource: imageSource
|
||||
textFieldPlaceholderText: placeholderText
|
||||
textField.text: textFieldText
|
||||
textField.echoMode: hideContent ? TextInput.Password : TextInput.Normal
|
||||
textField.placeholderText: placeholderContent
|
||||
textField.text: textField.text
|
||||
|
||||
rightButtonClickedOnEnter: true
|
||||
|
||||
|
|
@ -108,17 +103,12 @@ PageType {
|
|||
}
|
||||
|
||||
textField.onFocusChanged: {
|
||||
var _currentIndex = listView.currentIndex
|
||||
var _currentItem = listView.itemAtIndex(_currentIndex).children[0]
|
||||
listView.model[_currentIndex].textFieldText = _currentItem.textFieldText.replace(/^\s+|\s+$/g, '')
|
||||
textField.text = textField.text.replace(/^\s+|\s+$/g, '')
|
||||
}
|
||||
|
||||
textField.onTextChanged: {
|
||||
var _currentIndex = listView.currentIndex
|
||||
textFieldText = textField.text
|
||||
|
||||
if (_currentIndex === vars.secretDataIndex) {
|
||||
buttonImageSource = textFieldText !== "" ? (hideText ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg") : ""
|
||||
if (hideContent) {
|
||||
buttonImageSource = textField.text !== "" ? (hideContent ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg") : ""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -143,9 +133,9 @@ PageType {
|
|||
}
|
||||
|
||||
InstallController.setShouldCreateServer(true)
|
||||
var _hostname = listView.itemAtIndex(vars.hostnameIndex).children[0].textFieldText
|
||||
var _username = listView.itemAtIndex(vars.usernameIndex).children[0].textFieldText
|
||||
var _secretData = listView.itemAtIndex(vars.secretDataIndex).children[0].textFieldText
|
||||
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)
|
||||
|
||||
|
|
@ -194,23 +184,23 @@ PageType {
|
|||
function isCredentialsFilled() {
|
||||
var hasEmptyField = false
|
||||
|
||||
var _hostname = listView.itemAtIndex(vars.hostnameIndex).children[0]
|
||||
if (_hostname.textFieldText === "") {
|
||||
_hostname.errorText = qsTr("Ip address cannot be empty")
|
||||
var hostnameItem = listView.itemAtIndex(vars.hostnameIndex).children[0]
|
||||
if (hostnameItem.textField.text === "") {
|
||||
hostnameItem.errorText = qsTr("Ip address cannot be empty")
|
||||
hasEmptyField = true
|
||||
} else if (!_hostname.textField.acceptableInput) {
|
||||
_hostname.errorText = qsTr("Enter the address in the format 255.255.255.255:88")
|
||||
} else if (!hostnameItem.textField.acceptableInput) {
|
||||
hostnameItem.errorText = qsTr("Enter the address in the format 255.255.255.255:88")
|
||||
}
|
||||
|
||||
var _username = listView.itemAtIndex(vars.usernameIndex).children[0]
|
||||
if (_username.textFieldText === "") {
|
||||
_username.errorText = qsTr("Login cannot be empty")
|
||||
var usernameItem = listView.itemAtIndex(vars.usernameIndex).children[0]
|
||||
if (usernameItem.textField.text === "") {
|
||||
usernameItem.errorText = qsTr("Login cannot be empty")
|
||||
hasEmptyField = true
|
||||
}
|
||||
|
||||
var _secretData = listView.itemAtIndex(vars.secretDataIndex).children[0]
|
||||
if (_secretData.textFieldText === "") {
|
||||
_secretData.errorText = qsTr("Password/private key cannot be empty")
|
||||
var secretDataItem = listView.itemAtIndex(vars.secretDataIndex).children[0]
|
||||
if (secretDataItem.textField.text === "") {
|
||||
secretDataItem.errorText = qsTr("Password/private key cannot be empty")
|
||||
hasEmptyField = true
|
||||
}
|
||||
|
||||
|
|
@ -218,46 +208,37 @@ PageType {
|
|||
}
|
||||
|
||||
property list<QtObject> inputFields: [
|
||||
hostname,
|
||||
username,
|
||||
secretData
|
||||
hostnameObject,
|
||||
usernameObject,
|
||||
secretDataObject
|
||||
]
|
||||
|
||||
QtObject {
|
||||
id: hostname
|
||||
id: hostnameObject
|
||||
|
||||
property string title: qsTr("Server IP address [:port]")
|
||||
readonly property string placeholderText: qsTr("255.255.255.255:22")
|
||||
property string textFieldText: ""
|
||||
property bool hideText: false
|
||||
property string imageSource: ""
|
||||
readonly property var clickedHandler: function() {
|
||||
console.debug(">>> Server IP address text field was clicked!!!")
|
||||
clicked()
|
||||
}
|
||||
}
|
||||
|
||||
QtObject {
|
||||
id: username
|
||||
|
||||
property string title: qsTr("SSH Username")
|
||||
readonly property string placeholderText: "root"
|
||||
property string textFieldText: ""
|
||||
property bool hideText: false
|
||||
property string imageSource: ""
|
||||
readonly property string placeholderContent: qsTr("255.255.255.255:22")
|
||||
property bool hideContent: false
|
||||
readonly property var clickedHandler: undefined
|
||||
}
|
||||
|
||||
QtObject {
|
||||
id: secretData
|
||||
id: usernameObject
|
||||
|
||||
property string title: qsTr("SSH Username")
|
||||
readonly property string placeholderContent: "root"
|
||||
property bool hideContent: false
|
||||
readonly property var clickedHandler: undefined
|
||||
}
|
||||
|
||||
QtObject {
|
||||
id: secretDataObject
|
||||
|
||||
property string title: qsTr("Password or SSH private key")
|
||||
readonly property string placeholderText: ""
|
||||
property string textFieldText: ""
|
||||
property bool hideText: true
|
||||
property string imageSource: textFieldText !== "" ? (hideText ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg") : ""
|
||||
readonly property string placeholderContent: ""
|
||||
property bool hideContent: true
|
||||
readonly property var clickedHandler: function() {
|
||||
hideText = !hideText
|
||||
hideContent = !hideContent
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue