Compare commits

...

9 Commits

Author SHA1 Message Date
MrMirDan
33ccba5059 update: number of connected devices 2026-01-29 13:06:32 +02:00
MrMirDan
1485bb4a5d update: reload api acc info 2026-01-28 14:24:54 +02:00
MrMirDan
a12c16aa33 feat: unlink device tab 2026-01-27 13:03:21 +02:00
vkamn
f73792844c chore: revoke #2148 (#2160) 2026-01-26 19:39:47 +08:00
Yaroslav Gurov
a7199ca6f5 fix: add +x permissions to wireguard-go on linux (#2159) 2026-01-26 19:16:39 +08:00
vkamn
5e757cdd3b chore: bump qt version for linux build (#2157) 2026-01-25 21:35:16 +08:00
vkamn
92af1f3268 chore: runners (#2150)
* chore: change runner for linux and android

* chore: add libsecret to linux build

* chore: bump version
2026-01-23 12:05:31 +08:00
Yaroslav Gurov
aad9d6dae2 chore: remove redundant gateway (#2148) 2026-01-22 18:21:15 +08:00
Yaroslav Gurov
423fe3fd4f fix: remove redundant gateway from xrayprotocol (#2147) 2026-01-22 18:03:36 +08:00
7 changed files with 30 additions and 8 deletions

View File

@@ -10,10 +10,10 @@ env:
jobs:
Build-Linux-Ubuntu:
runs-on: 4-core
runs-on: android-runner
env:
QT_VERSION: 6.8.3
QT_VERSION: 6.10.1
QIF_VERSION: 4.7
PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
@@ -58,7 +58,7 @@ jobs:
- name: 'Build project'
run: |
sudo apt-get install libxkbcommon-x11-0
sudo apt-get install libxkbcommon-x11-0 libsecret-1-dev
export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin
export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin
bash deploy/build_linux.sh
@@ -537,7 +537,7 @@ jobs:
# ------------------------------------------------------
Build-Android:
runs-on: 4-core
runs-on: android-runner
env:
ANDROID_BUILD_PLATFORM: android-36

View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
set(PROJECT AmneziaVPN)
set(AMNEZIAVPN_VERSION 4.8.12.8)
set(AMNEZIAVPN_VERSION 4.8.12.9)
project(${PROJECT} VERSION ${AMNEZIAVPN_VERSION}
DESCRIPTION "AmneziaVPN"
@@ -12,7 +12,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
set(RELEASE_DATE "${CURRENT_DATE}")
set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
set(APP_ANDROID_VERSION_CODE 2104)
set(APP_ANDROID_VERSION_CODE 2105)
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(MZ_PLATFORM_NAME "linux")

View File

@@ -47,6 +47,8 @@ PageType {
}
WarningType {
visible: !ServersModel.getProcessedServerData("isServerFromTelegramApi")
Layout.topMargin: 16
Layout.rightMargin: 16
Layout.leftMargin: 16

View File

@@ -98,6 +98,7 @@ PageType {
property list<QtObject> serverActions: [
check,
reboot,
deviceCountObject,
remove,
clear,
reset,
@@ -147,6 +148,22 @@ PageType {
}
}
QtObject {
id: deviceCountObject
property bool isVisible: ServersModel.getProcessedServerData("isServerFromTelegramApi")
readonly property string title: qsTr("Active Connections")
readonly property string description: qsTr("Manage currently connected devices: " + ApiAccountInfoModel.data("connectedDevices"))
readonly property var tColor: AmneziaStyle.color.lightGray
readonly property string objectImageSource: "qrc:/images/controls/monitor.svg"
readonly property bool isRichText: false
readonly property var clickedHandler: function() {
// ApiSettingsController.updateApiCountryModel()
// ApiSettingsController.updateApiDevicesModel()
PageController.goToPage(PageEnum.PageSettingsApiDevices)
}
}
QtObject {
id: remove

View File

@@ -99,6 +99,9 @@ PageType {
PageController.goToPage(PageEnum.PageSettingsApiServerInfo)
} else {
if (ServersModel.getProcessedServerData("isServerFromTelegramApi")) {
ApiSettingsController.getAccountInfo(false)
}
PageController.goToPage(PageEnum.PageSettingsServerInfo)
}
}

View File

@@ -499,7 +499,7 @@ bool VpnConnection::startNetworkCheckIfReady()
return IpcClient::withInterface([&](QSharedPointer<IpcInterfaceReplica> iface) {
QRemoteObjectPendingReply<bool> reply = iface->startNetworkCheck(gateway, localAddress);
return reply.waitForFinished() && reply.returnValue();
return reply.waitForFinished(1000) && reply.returnValue();
});
#else
return false;