059257fc58
* 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>
375 lines
14 KiB
QML
375 lines
14 KiB
QML
import QtQuick
|
|
import QtQuick.Controls
|
|
import QtQuick.Layouts
|
|
import QtQuick.Dialogs
|
|
|
|
import QtCore
|
|
|
|
import SortFilterProxyModel 0.2
|
|
|
|
import PageEnum 1.0
|
|
import ContainerProps 1.0
|
|
import Style 1.0
|
|
|
|
import "./"
|
|
import "../Controls2"
|
|
import "../Controls2/TextTypes"
|
|
import "../Config"
|
|
import "../Components"
|
|
|
|
DrawerType2 {
|
|
id: root
|
|
|
|
property string headerText
|
|
property string configContentHeaderText
|
|
property string shareButtonText: qsTr("Share")
|
|
property string copyButtonText: qsTr("Copy")
|
|
property bool isSelfHostedConfig: true
|
|
|
|
property string configExtension: ".vpn"
|
|
property string configCaption: qsTr("Save AmneziaVPN config")
|
|
property string configFileName: "amnezia_config"
|
|
|
|
expandedHeight: parent.height * 0.9
|
|
|
|
onClosed: {
|
|
configExtension = ".vpn"
|
|
configCaption = qsTr("Save AmneziaVPN config")
|
|
configFileName = "amnezia_config"
|
|
}
|
|
|
|
expandedStateContent: Item {
|
|
implicitHeight: root.expandedHeight
|
|
|
|
Header2Type {
|
|
id: header
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: 20
|
|
anchors.leftMargin: 16
|
|
anchors.rightMargin: 16
|
|
|
|
headerText: root.headerText
|
|
}
|
|
|
|
ListView {
|
|
id: listView
|
|
|
|
anchors.top: header.bottom
|
|
anchors.bottom: parent.bottom
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
property bool isFocusable: true
|
|
|
|
ScrollBar.vertical: ScrollBarType {}
|
|
|
|
model: 1
|
|
|
|
clip: true
|
|
reuseItems: true
|
|
|
|
header: ColumnLayout {
|
|
width: listView.width
|
|
|
|
BasicButtonType {
|
|
id: shareButton
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 16
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
text: root.shareButtonText
|
|
leftImageSource: "qrc:/images/controls/share-2.svg"
|
|
|
|
clickedFunc: function() {
|
|
var fileName = ""
|
|
if (GC.isMobile()) {
|
|
fileName = configFileName + configExtension
|
|
} else {
|
|
fileName = SystemController.getFileName(configCaption,
|
|
qsTr("Config files (*" + configExtension + ")"),
|
|
StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/" + configFileName,
|
|
true,
|
|
configExtension)
|
|
}
|
|
if (fileName !== "") {
|
|
PageController.showBusyIndicator(true)
|
|
ExportController.exportConfig(fileName)
|
|
PageController.showBusyIndicator(false)
|
|
}
|
|
}
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: copyConfigTextButton
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 8
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.mutedGray
|
|
textColor: AmneziaStyle.color.paleGray
|
|
borderWidth: 1
|
|
|
|
text: root.copyButtonText
|
|
leftImageSource: "qrc:/images/controls/copy.svg"
|
|
|
|
Keys.onReturnPressed: { copyConfigTextButton.clicked() }
|
|
Keys.onEnterPressed: { copyConfigTextButton.clicked() }
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: copyNativeConfigStringButton
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 8
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
visible: false
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.mutedGray
|
|
textColor: AmneziaStyle.color.paleGray
|
|
borderWidth: 1
|
|
|
|
text: qsTr("Copy config string")
|
|
leftImageSource: "qrc:/images/controls/copy.svg"
|
|
|
|
KeyNavigation.tab: showSettingsButton
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: showSettingsButton
|
|
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 24
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
visible: root.isSelfHostedConfig
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.mutedGray
|
|
textColor: AmneziaStyle.color.paleGray
|
|
borderWidth: 1
|
|
|
|
text: qsTr("Show connection settings")
|
|
|
|
clickedFunc: function() {
|
|
configContentDrawer.openTriggered()
|
|
}
|
|
}
|
|
|
|
DrawerType2 {
|
|
id: configContentDrawer
|
|
|
|
parent: root.parent
|
|
|
|
anchors.fill: parent
|
|
expandedHeight: parent.height * 0.9
|
|
|
|
expandedStateContent: Item {
|
|
id: configContentContainer
|
|
|
|
implicitHeight: configContentDrawer.expandedHeight
|
|
|
|
Connections {
|
|
target: copyNativeConfigStringButton
|
|
function onClicked() {
|
|
nativeConfigString.selectAll()
|
|
nativeConfigString.copy()
|
|
nativeConfigString.select(0, 0)
|
|
PageController.showNotificationMessage(qsTr("Copied"))
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
target: copyConfigTextButton
|
|
function onClicked() {
|
|
configText.selectAll()
|
|
configText.copy()
|
|
configText.select(0, 0)
|
|
PageController.showNotificationMessage(qsTr("Copied"))
|
|
header.forceActiveFocus()
|
|
}
|
|
}
|
|
|
|
BackButtonType {
|
|
id: backButton
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: 16
|
|
|
|
backButtonFunction: function() { configContentDrawer.closeTriggered() }
|
|
}
|
|
|
|
FlickableType {
|
|
anchors.top: backButton.bottom
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.bottom: parent.bottom
|
|
contentHeight: configContent.implicitHeight + configContent.anchors.topMargin + configContent.anchors.bottomMargin
|
|
|
|
ColumnLayout {
|
|
id: configContent
|
|
|
|
anchors.fill: parent
|
|
anchors.rightMargin: 16
|
|
anchors.leftMargin: 16
|
|
|
|
Header2Type {
|
|
id: configContentHeader
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 16
|
|
|
|
headerText: root.configContentHeaderText
|
|
}
|
|
|
|
TextField {
|
|
id: nativeConfigString
|
|
visible: false
|
|
text: ExportController.nativeConfigString
|
|
|
|
onTextChanged: {
|
|
copyNativeConfigStringButton.visible = nativeConfigString.text !== ""
|
|
}
|
|
}
|
|
|
|
TextArea {
|
|
id: configText
|
|
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 16
|
|
Layout.bottomMargin: 16
|
|
|
|
padding: 0
|
|
leftPadding: 0
|
|
height: 24
|
|
|
|
readOnly: true
|
|
activeFocusOnTab: false
|
|
|
|
color: AmneziaStyle.color.paleGray
|
|
selectionColor: AmneziaStyle.color.richBrown
|
|
selectedTextColor: AmneziaStyle.color.paleGray
|
|
|
|
font.pixelSize: 16
|
|
font.weight: Font.Medium
|
|
font.family: "PT Root UI VF"
|
|
|
|
text: ExportController.config
|
|
|
|
wrapMode: Text.Wrap
|
|
|
|
background: Rectangle {
|
|
color: AmneziaStyle.color.transparent
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
delegate: ColumnLayout {
|
|
width: listView.width
|
|
|
|
property bool isQrCodeVisible: root.isSelfHostedConfig ? ExportController.qrCodesCount > 0 : ApiConfigsController.qrCodesCount > 0
|
|
|
|
Rectangle {
|
|
id: qrCodeContainer
|
|
|
|
Layout.fillWidth: true
|
|
Layout.preferredHeight: width
|
|
Layout.topMargin: 20
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
visible: isQrCodeVisible
|
|
|
|
color: "white"
|
|
|
|
Image {
|
|
anchors.fill: parent
|
|
smooth: false
|
|
|
|
source: root.isSelfHostedConfig ? (isQrCodeVisible ? ExportController.qrCodes[0] : "") :
|
|
(isQrCodeVisible ? ApiConfigsController.qrCodes[0] : "")
|
|
|
|
property bool isFocusable: true
|
|
|
|
Keys.onTabPressed: {
|
|
FocusController.nextKeyTabItem()
|
|
}
|
|
|
|
Keys.onBacktabPressed: {
|
|
FocusController.previousKeyTabItem()
|
|
}
|
|
|
|
Keys.onUpPressed: {
|
|
FocusController.nextKeyUpItem()
|
|
}
|
|
|
|
Keys.onDownPressed: {
|
|
FocusController.nextKeyDownItem()
|
|
}
|
|
|
|
Keys.onLeftPressed: {
|
|
FocusController.nextKeyLeftItem()
|
|
}
|
|
|
|
Keys.onRightPressed: {
|
|
FocusController.nextKeyRightItem()
|
|
}
|
|
|
|
Timer {
|
|
property int index: 0
|
|
interval: 1000
|
|
running: isQrCodeVisible
|
|
repeat: true
|
|
onTriggered: {
|
|
if (isQrCodeVisible) {
|
|
index++
|
|
let qrCodesCount = root.isSelfHostedConfig ? ExportController.qrCodesCount : ApiConfigsController.qrCodesCount
|
|
if (index >= qrCodesCount) {
|
|
index = 0
|
|
}
|
|
|
|
parent.source = root.isSelfHostedConfig ? ExportController.qrCodes[index] : ApiConfigsController.qrCodes[index]
|
|
}
|
|
}
|
|
}
|
|
|
|
Behavior on source {
|
|
PropertyAnimation { duration: 200 }
|
|
}
|
|
}
|
|
}
|
|
|
|
ParagraphTextType {
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 24
|
|
Layout.bottomMargin: 32
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
visible: isQrCodeVisible
|
|
|
|
horizontalAlignment: Text.AlignHCenter
|
|
text: qsTr("To read the QR code in the Amnezia app, select \"Add server\" → \"I have data to connect\" → \"QR code, key or settings file\"")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|