Merge branch 'feature/new-gui' of github.com:amnezia-vpn/amnezia-client into feature/new-gui

2023-09-01 20:21:33 +05:00 · 2023-09-01 20:21:33 +05:00 · 7fc4ea0c68
commit 7fc4ea0c68
parent a96f485e3c 195a3ab170
12 changed files with 35 additions and 29 deletions
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@ -100,7 +100,13 @@ PageType {

                        image: "qrc:/images/controls/save.svg"

-                        onClicked: fileDialog.open()
+                        onClicked: {
+                            if (Qt.platform.os === "ios") {
+                                SettingsController.exportLogsFile("AmneziaVPN.log")
+                            } else {
+                                fileDialog.open()
+                            }
+                        }

                        FileDialog {
                            id: fileDialog
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@ -302,7 +302,11 @@ PageType {
                    text: qsTr("Save site list")

                    clickedFunction: function() {
-                        saveFileDialog.open()
+                        if (Qt.platform.os === "ios") {
+                            ExportController.saveFile("amezia_tunnel.json")
+                        } else {
+                            saveFileDialog.open()
+                        }
                    }

                    FileDialog {