mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-23 02:00:20 +07:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| eda14f57d6 | |||
| de02be61f3 |
@@ -192,11 +192,12 @@ QStringList GatewayController::getProxyUrls(const QString &serviceType, const QS
|
|||||||
QStringList proxyStorageUrls;
|
QStringList proxyStorageUrls;
|
||||||
if (!serviceType.isEmpty()) {
|
if (!serviceType.isEmpty()) {
|
||||||
for (const auto &baseUrl : baseUrls) {
|
for (const auto &baseUrl : baseUrls) {
|
||||||
proxyStorageUrls.push_back(baseUrl + "-" + serviceType + "-" + userCountryCode + ".json");
|
QByteArray path = ("endpoints-" + serviceType + "-" + userCountryCode).toUtf8();
|
||||||
|
proxyStorageUrls.push_back(baseUrl + path.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals) + ".json");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (const auto &baseUrl : baseUrls) {
|
for (const auto &baseUrl : baseUrls) {
|
||||||
proxyStorageUrls.push_back(baseUrl + ".json");
|
proxyStorageUrls.push_back(baseUrl + "endpoints.json");
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const auto &proxyStorageUrl : proxyStorageUrls) {
|
for (const auto &proxyStorageUrl : proxyStorageUrls) {
|
||||||
|
|||||||
@@ -136,9 +136,13 @@ PageType {
|
|||||||
readonly property string leftImagePath: NewsModel.hasUnread ? "qrc:/images/controls/news-unread.svg" : "qrc:/images/controls/news.svg"
|
readonly property string leftImagePath: NewsModel.hasUnread ? "qrc:/images/controls/news-unread.svg" : "qrc:/images/controls/news.svg"
|
||||||
property bool isVisible: ServersModel.hasServersFromGatewayApi
|
property bool isVisible: ServersModel.hasServersFromGatewayApi
|
||||||
readonly property var clickedHandler: function() {
|
readonly property var clickedHandler: function() {
|
||||||
if (!ServersModel.hasServersFromGatewayApi) return;
|
if (!ServersModel.hasServersFromGatewayApi) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
PageController.showBusyIndicator(true)
|
||||||
ApiNewsController.fetchNews();
|
ApiNewsController.fetchNews();
|
||||||
PageController.goToPage(PageEnum.PageSettingsNewsNotifications)
|
PageController.goToPage(PageEnum.PageSettingsNewsNotifications)
|
||||||
|
PageController.showBusyIndicator(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ PageType {
|
|||||||
target: ImportController
|
target: ImportController
|
||||||
|
|
||||||
function onImportErrorOccurred(error, goToPageHome) {
|
function onImportErrorOccurred(error, goToPageHome) {
|
||||||
|
PageController.showBusyIndicator(false)
|
||||||
if (goToPageHome) {
|
if (goToPageHome) {
|
||||||
PageController.goToStartPage()
|
PageController.goToStartPage()
|
||||||
} else {
|
} else {
|
||||||
@@ -43,6 +44,7 @@ PageType {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function onImportFinished() {
|
function onImportFinished() {
|
||||||
|
PageController.showBusyIndicator(false)
|
||||||
if (!ConnectionController.isConnected) {
|
if (!ConnectionController.isConnected) {
|
||||||
ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
|
ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
|
||||||
ServersModel.processedIndex = ServersModel.defaultIndex
|
ServersModel.processedIndex = ServersModel.defaultIndex
|
||||||
@@ -216,6 +218,7 @@ PageType {
|
|||||||
if (cloakingCheckBoxItem.checked) {
|
if (cloakingCheckBoxItem.checked) {
|
||||||
ImportController.processNativeWireGuardConfig()
|
ImportController.processNativeWireGuardConfig()
|
||||||
}
|
}
|
||||||
|
PageController.showBusyIndicator(true)
|
||||||
ImportController.importConfig()
|
ImportController.importConfig()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user