andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-21 02:01:03 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

update: changes after merging with dev

Browse Source
This commit is contained in:
MrMirDan
2026-06-16 18:44:15 +03:00
parent de5205aa6f
commit 470c736571
7 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/core/controllers/selfhosted/importController.cpp
+1 -1
View File
@@ -502,7 +502,7 @@ ImportController::ImportResult ImportController::importLink(const QUrl &url)
serverConfig.insert(it.key(), it.value());
}
serverConfig.insert(configKey::description, m_appSettingsRepository->nextAvailableServerName());
serverConfig.insert(configKey::description, m_serversRepository->nextAvailableServerName());
serverConfig[configKey::xraySubscriptionLink] = url.toString();
serverConfig[configKey::xraySubscriptionConfig] = configStrings;
serverConfig[configKey::xraySubscriptionConfigName] = configNames;
client/ui/controllers/serversUiController.cpp
+5
View File
@@ -343,6 +343,11 @@ bool ServersUiController::isServerSubscriptionExpiringSoon(const QString &server
return serverDescriptionById(serverId).isSubscriptionExpiringSoon;
}
bool ServersUiController::isServerContainXRayConfigs(const QString &serverId) const
{
return serverDescriptionById(serverId).isXRaySubscription;
}
int ServersUiController::getProcessedContainerIndex() const
{
return m_processedContainerIndex;
client/ui/controllers/serversUiController.h
+3 -1
View File
@@ -28,7 +28,7 @@ class ServersUiController : public QObject
Q_PROPERTY(bool isDefaultServerDefaultContainerHasSplitTunneling READ isDefaultServerDefaultContainerHasSplitTunneling NOTIFY defaultServerIdChanged)
Q_PROPERTY(bool isDefaultServerFromApi READ isDefaultServerFromApi NOTIFY defaultServerIdChanged)
Q_PROPERTY(bool isDefaultServerContainXRayConfigs READ isDefaultServerContainXRayConfigs NOTIFY defaultServerIndexChanged)
Q_PROPERTY(bool isDefaultServerContainXRayConfigs READ isDefaultServerContainXRayConfigs NOTIFY defaultServerIdChanged)
Q_PROPERTY(QString processedServerId READ getProcessedServerId WRITE setProcessedServerId NOTIFY processedServerIdChanged)
Q_PROPERTY(int processedContainerIndex READ getProcessedContainerIndex WRITE setProcessedContainerIndex NOTIFY processedContainerIndexChanged)
@@ -87,6 +87,8 @@ public slots:
bool isServerRenewalAvailable(const QString &serverId) const;
bool isServerSubscriptionExpired(const QString &serverId) const;
bool isServerSubscriptionExpiringSoon(const QString &serverId) const;
bool isServerContainXRayConfigs(const QString &serverId) const;
QString getProcessedServerId() const;
void setProcessedServerId(const QString &serverId);
client/ui/qml/Components/ServersListView.qml
+1 -1
View File
@@ -121,7 +121,7 @@ ListViewType {
PageController.goToPage(PageEnum.PageSettingsApiServerInfo)
}
} else if (ServersModel.getProcessedServerData("isXRayConfigSelectionAvailable")) {
} else if (ServersUiController.isServerContainXRayConfigs(ServersUiController.processedServerId)) {
PageController.goToPage(PageEnum.PageSettingsXRayAvailableConfigs)
} else {
PageController.goToPage(PageEnum.PageSettingsServerInfo)
client/ui/qml/Pages2/PageHome.qml
+1 -1
View File
@@ -359,7 +359,7 @@ PageType {
PageController.goToPage(PageEnum.PageSettingsApiServerInfo)
}
} else if (ServersModel.getProcessedServerData("isXRayConfigSelectionAvailable")) {
} else if (ServersUiController.isServerContainXRayConfigs(ServersUiController.processedServerId)) {
PageController.goToPage(PageEnum.PageSettingsXRayAvailableConfigs)
} else {
PageController.goToPage(PageEnum.PageSettingsServerInfo)
client/ui/qml/Pages2/PageSettingsXRayAvailableConfigs.qml
+19 -3
View File
@@ -19,10 +19,26 @@ PageType {
property var processedServer
Connections {
target: PageController
function onGoToPageSettingsServerServices() {
tabBar.setCurrentIndex(root.pageSettingsServerServices)
}
}
Connections {
target: ServersUiController
function onProcessedServerIdChanged() {
root.processedServer = proxyServersModel.get(0)
}
}
Connections {
target: ServersModel
function onProcessedServerChanged() {
function onModelReset() {
root.processedServer = proxyServersModel.get(0)
}
}
@@ -34,8 +50,8 @@ PageType {
sourceModel: ServersModel
filters: [
ValueFilter {
roleName: "isCurrentlyProcessed"
value: true
roleName: "serverId"
value: ServersUiController.processedServerId
}
]
client/ui/qml/Pages2/PageSettingsXRayServerInfo.qml
+21 -5
View File
@@ -19,10 +19,26 @@ PageType {
property var processedServer
Connections {
target: PageController
function onGoToPageSettingsServerServices() {
tabBar.setCurrentIndex(root.pageSettingsServerServices)
}
}
Connections {
target: ServersUiController
function onProcessedServerIdChanged() {
root.processedServer = proxyServersModel.get(0)
}
}
Connections {
target: ServersModel
function onProcessedServerChanged() {
function onModelReset() {
root.processedServer = proxyServersModel.get(0)
}
}
@@ -34,8 +50,8 @@ PageType {
sourceModel: ServersModel
filters: [
ValueFilter {
roleName: "isCurrentlyProcessed"
value: true
roleName: "serverId"
value: ServersUiController.processedServerId
}
]
@@ -109,7 +125,7 @@ PageType {
var noButtonText = qsTr("Cancel")
var yesButtonFunction = function() {
if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
if (ServersUiController.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
PageController.showNotificationMessage(qsTr("Cannot reload config during active connection"))
} else {
PageController.showBusyIndicator(true)
@@ -147,7 +163,7 @@ PageType {
var noButtonText = qsTr("Cancel")
var yesButtonFunction = function() {
if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
if (ServersUiController.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
PageController.showNotificationMessage(qsTr("Cannot remove server during active connection"))
} else {
PageController.showBusyIndicator(true)