2916 Commits

Author SHA1 Message Date
vkamn
43e73f0ffe Chore/merge with upstream (#41)
* fix: add suppord android 9 gamepad and remote control (#2302)

* fix: remove nested qeventloop from isConfigValid (also rename to validateConfig) (#2305)

* fix: remove nested qeventloop from isConfigValid (also rename to validateConfig)

* chore: bump version

* fix: add handle handleContextCreationFailure (#2309)

* fix: GP requrements (#2312)

* chore: bump version (#2319)

* fix: disable gamepad for GP (#2321)

* chore: bump version (#2331)

* fix: restore dpad functionality ATV (#2335)

* chore: bump version (#2336)

* fix: swap buffers error (#2347)

* fix: apple platform network switch fix (#2359)

* Apple platform network switch fix

* macos_ne exclusion fixed

* chore: update licnese file (#2376)

* fix openfile deadlock (#2373)

* feat: add base amnezia trial support (#2366)

* feat: add base amnezia trial support

* feat: add external-trial

* feat: add warning info for ssh keys (#2252)

* fix: fixed da typo

* feat: added warning about available ssh keys info

* feat: add Xray split tunnel support for iOS PacketTunnelProvider (#2332)

* chore: send app version in services request (#2403)

* refactor: extract and simplify OpenVPN reachability and network change handling logic (#2402)

* fix: black screen resume / pause (#2400)

* feat: add subscription renewal (#2389)

* feat: add renewal subsribe

* fix: after review

* fix: ui fixes for renewal subscription (#2406)

* feat: renewal new status logic (#2409)

* fix: renewal add status logic

* fix: wakeup activity resumed android

* feat: new services description (#2412)

* feat: iap for apple now use storekit2

* fix: fixed error 101 on connection event

* feat: enhance StoreKit2Helper to handle entitlements and improve restore service from App Store functionality

* chore: add isInAppPurchase and isTestPurchase in primary config

* refactor: use end_date from primary config for renew ui

* fix: hide renew button for free

* fix: hide renew button for appstore purchases

* feat: add new premium info page

* feat: add new free info page

* chore: minor fixes

* refactor: move plan and benefits into separate models

* fix: fixed expired status when configs without an end date

* feat: add trial api support

* chore: add api message parsing for 422 error

* feat: move privacy policy and term of use to gateway

* feat: add iap support for new premium info page

* chore: minor fixes

* chore: minor fix

* chore: minor fixes

* feat: additional parsing for storekit subscription plans

* chore: minor codestyle fixes

* chore: simplify benefits

* chore: hide extend buttons on external premium

* feat: add trial error processing

* fix: remove wrong check from tiral handler

* chore: cleanup

---------

Co-authored-by: spectrum <yyy@amnezia.org>

* fix: full server cleanup (#2446)

* Fix: full server cleanup

* Cleaning by REPOSITORY:TAG

* fix: ios ovpn fix (#2360)

* feat: enhance OpenVPN support and configuration handling for iOS and macOS platforms

* Deps updated

* Deps updated

* feat: add OpenVPN configuration validation and regeneration logic to VpnConfigurationsController

* revert: restore pre-fix OpenVPN NE flow

* chore: add OpenVPN NE payload diagnostics

* Revert "revert: restore pre-fix OpenVPN NE flow"

This reverts commit ae99cc77e9fa982c20b15e4ca843bfebe0916942.

* chore: remove openvpn config processing

---------

Co-authored-by: vkamn <vk@amnezia.org>

* chore: block vless toggle while active connection (#2318)

* fix: prevent disabled SwitcherType from toggling via keyboard

* fix: disabled vless option toggle while connection is active

* chore: minor fixes (#2459)

* fix: fixed links on page with service description

* fix: fixed subscription text color

* chore: update ru translations

* chore: add save button

* fix: ru translation fixes

* fix: set a fixed 3proxy ver 0.9.5 (#2468)

* fix: tun2socks auth settings (#2456)

* add parser auth/pass & fix port

* fix generateRandomHex

* remove hardcore port ios

* add generated random port

* fix sin6_port

* fixed inbound

* add error message

* add std::runtime_error & fixed random generator

* remove loop

---------

Co-authored-by: Yaumenau Pavel <yaumenau.pavel@planetvpn.dev>

* fix: add linux reconnection (#2415)

* fix: add linux reconnection

* fix: Dbus error, fix race conditional

* fix: improve reeconnection

* fix: add dns load/unload

* feat:  catch  state changed via  check gateway

* revert: restore linuxfirewall.cpp

* fix: restore reconnect time

* fix: add   NM_STATE_DISABLED and  check getGatewayAndIface more carefully

* fix: reconnect

* fix: revert wireguardutilslinux

* fix: revert

* chore: minor fixes (#2477)

* feat: add renewal for external-premium (#2485)

* feat: add renewal for external-premium

* chore: bump version

* chore: send subscription status for renewal link request

* chore: remove ip from tunnel name for ios (#2489)

* chore: bump version (#2502)

* feat: add fallback proxy endpoint (#2518)

* chore: minor fixes (#2524)

* fix: fixed i5 empty check

* fix: add check config format in extractConfigFromQr

---------

Co-authored-by: NickVs2015 <nv@amnezia.org>
Co-authored-by: yyy-amnezia <yyy@amnezia.org>
Co-authored-by: Mitternacht822 <sb@amnezia.org>
Co-authored-by: lunardunno <126363523+lunardunno@users.noreply.github.com>
Co-authored-by: Mitternacht822 <208699442+Mitternacht822@users.noreply.github.com>
Co-authored-by: yp <yp@amnezia.org>
Co-authored-by: Yaumenau Pavel <yaumenau.pavel@planetvpn.dev>
2026-04-29 12:42:12 +08:00
vkamn
509e79ee31 Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into HEAD 2026-04-29 12:40:36 +08:00
Mitternacht822
04212e221c Merge pull request #39 from amnezia-vpn/bugfix/various-ui-bugs
Bugfix/various UI bugs
2026-04-29 12:29:28 +08:00
vkamn
907785797e chore: merge with upstream (#38)
* fix: add checks for script components to find out where it can fall (#2169)

* fix: fix scrolling on drawers (#2183)

* fix: added enablePeerTraffic call to xray (#2179)

* fix: add enablePeerTraffic call to xray

* chore: remove unnecessary steps during xray TUN setup phase

* chore: move tun init from tun2socks code to ipcserver

* chore: rework xray routing
* get rid of redundant delays
* check if remote calls are successful

* chore: xray routing fine-tuning

* fix: add service qt deps to deployment build

* chore: add sending of release_date to s3

* fix: placeholder color, hide button image transparency, removed some lines (#2123)

* fix: placeholder color, hide button image transparency, removed unneccessary lines

* update: removed opacity on tunneling page

* update: remove opacity on app tunneling page

* fix: deploy qopensslbackend on windows (#2190)

* feat: add EULA and policy on IAP page (#2189)

* feat: add gamepad buttons support android (#2066)

* feat: add support gamepad buttons

* feat: add support gamepad with github repo

* feat: add gitmodules dependency

* feat: add submodule qtgamepad

* chore: update qtgamepad submodule to commit 4e57142e563b931766056b4c7507c16892260222

* fix: update qtgamepad with standard CMake and private headers support

Update qtgamepad to commit f72b3e0 which:
- Replaces qt_add_library with standard add_library to avoid Qt 6.10 macro conflicts
- Copies private headers to build include tree for Android backend
- Creates Qt:: and Qt6:: namespace aliases for proper linking

* fix: allow start Gamepad only Android (#2198)

* fix: native wg obfuscation (#2199)

* chore: bump version

* fix: fixed native wg obfuscation

* fix OpenGl error (#2185)

* fix: returned mentioned lines (#2205)

* fix: xray stability and split-tunneling (#2187)

* fix: xray heap corruption

* fix: use proper configuration for split-tunneled apps

* chore: enable killswitch

* chore: xray windows split-tunneling cleanup

* chore: proper xray killswitch log

* feat: add wait for the tun device

* chore: update amnezia_xray deps for macos

* fix: add nullptr check for split-tunnel on win

* fix: modernize vpnAdapter grabbing function

* fix: remove network watcher due to its fragileness

* chore: xrayprotocol cleanup

* fix: correct wrong iface index on win

* chore: move tun2socks implementation to the client from the service

* chore: xrayprotocol cleanup

* chore: more xrayprotocol cleanup

* fix: consistent tun device with GUID specified

* chore: tun2socks logs

* chore: PrivilegedProcess cleanup
* better error handling in establishment phase
* terminate&kill ops for remote process

* fix: straighforward killing the process on windows

* fix: finally remove GUID setting from tun2socks due to instability

* fix: add sanitizer to ipc process

* chore: do not collect sensitive info from tun2socks

* feat: native wg with obfuscation (#2209)

* chore: change default i1 value

* feat: add i1 to native wg with obfuscation

* chore: change default i1 value (#2216)

* fix: do not enable killswitch by default when service starts (#2232)

* fix: added stop and delete AmneziaVPNSplitTunnel on uninstall (#2222)

* fix: add network watcher back (#2240)

* feat: add reconnect in case of changing network

* fix: reconnect to VPN on wakeup

* fix: linux wakeup build

* fix: remove revoke from remove subscription flow (#2226)

* fix(revoke): now revoke calls only for unlink device action

* fix: removed revoke call when removing a subscription from the app

* chore: bump version (#2244)

* chore: add license to msi installer (#2227)

* fix: handle Android disconnected status properly (#2255)

* fix: randomized baseUrls traversal order in GatewayController::getProxyUrls (#2247)

* chore: bump version (#2261)

* chore: bump version (#2262)

* fix: ios connection status stuck (#2263)

* chore: bump version (#2264)

* chore: bump version

* chore: bump version

* feat: update xray (#2267)

* feat: update amneziawg-android dependencies (#2269)

* fix: copy LICENSE to build as LICENSE.txt for WiX CPack (#2265)

* fix(installer): copy LICENSE to build as LICENSE.txt for WiX CPack

* fix: fixed a typo

* fix: fixed a typo

* fix: ios wrong awg blob (#2272)

* fix: fixed remote control for ATV (#2277)

* fix: change event looping to mutexes for settings and secureqsettings (#2270)

* chore: remove redundant VpnConnection usage from SitesController (#2278)

* fix: awg config update (#2281)

* fix: fixed client config update for awg container

* chore: bump version

* fix: generate native awg config as qr series (#2221)

* fix: fixed s3, s4 ranges (#2283)

* fix: again fixed s3, s4 ranges (#2288)

* fix: fixed adding s3 s4 when updating the server conf for awg lagacy (#2289)

* chore: revert PR #2222 (#2290)

* fix: restore backup android (#2291)

* fix: fixed restore backup on android

* chore: add resume helper for android

* chore: add ResumeHelper.runWhenActive call after all native android dialogs

* fix: add permission for tv file picker

* fix: add file picker handler in kotlin

---------

Co-authored-by: NickVs2015 <nv@amnezia.org>

* chore: add translations for ru (#2285)

* chore: add translations for ru

* chore: text fixes

* chore: bump version (#2295)

* chore: update ru translation

---------

Co-authored-by: ik <ik@amnezia.org>
Co-authored-by: Yaroslav Gurov <31506978+ygurov@users.noreply.github.com>
Co-authored-by: MrMirDan <58086007+MrMirDan@users.noreply.github.com>
Co-authored-by: NickVs2015 <nv@amnezia.org>
Co-authored-by: Mitternacht822 <sb@amnezia.org>
2026-04-29 12:29:11 +08:00
vkamn
2edd7de413 chore: minor fixes (#2524)
* fix: fixed i5 empty check

* fix: add check config format in extractConfigFromQr
2026-04-27 13:18:50 +08:00
vkamn
f0da2b003f feat: add fallback proxy endpoint (#2518) 2026-04-23 21:30:18 +08:00
vkamn
650c1c6ebb chore: bump version (#2502) 2026-04-20 20:32:59 +08:00
vkamn
8dbded1624 chore: remove ip from tunnel name for ios (#2489) 2026-04-17 15:02:54 +08:00
vkamn
cebfcc846e feat: add renewal for external-premium (#2485)
* feat: add renewal for external-premium

* chore: bump version

* chore: send subscription status for renewal link request
2026-04-17 15:01:24 +08:00
vkamn
4c18ceaa50 chore: minor fixes (#2477) 2026-04-14 16:27:46 +08:00
NickVs2015
ebe3a5dac6 fix: add linux reconnection (#2415)
* fix: add linux reconnection

* fix: Dbus error, fix race conditional

* fix: improve reeconnection

* fix: add dns load/unload

* feat:  catch  state changed via  check gateway

* revert: restore linuxfirewall.cpp

* fix: restore reconnect time

* fix: add   NM_STATE_DISABLED and  check getGatewayAndIface more carefully

* fix: reconnect

* fix: revert wireguardutilslinux

* fix: revert
2026-04-14 11:10:41 +08:00
yp
92deee5f67 fix: tun2socks auth settings (#2456)
* add parser auth/pass & fix port

* fix generateRandomHex

* remove hardcore port ios

* add generated random port

* fix sin6_port

* fixed inbound

* add error message

* add std::runtime_error & fixed random generator

* remove loop

---------

Co-authored-by: Yaumenau Pavel <yaumenau.pavel@planetvpn.dev>
2026-04-13 20:06:08 +08:00
lunardunno
a75bd0cf5e fix: set a fixed 3proxy ver 0.9.5 (#2468) 2026-04-13 12:27:45 +08:00
vkamn
46f5b3894b chore: minor fixes (#2459)
* fix: fixed links on page with service description

* fix: fixed subscription text color

* chore: update ru translations

* chore: add save button

* fix: ru translation fixes
2026-04-10 22:24:00 +08:00
Mitternacht822
493ee22883 chore: block vless toggle while active connection (#2318)
* fix: prevent disabled SwitcherType from toggling via keyboard

* fix: disabled vless option toggle while connection is active
2026-04-08 12:45:51 +08:00
yyy-amnezia
ad14847eb5 fix: ios ovpn fix (#2360)
* feat: enhance OpenVPN support and configuration handling for iOS and macOS platforms

* Deps updated

* Deps updated

* feat: add OpenVPN configuration validation and regeneration logic to VpnConfigurationsController

* revert: restore pre-fix OpenVPN NE flow

* chore: add OpenVPN NE payload diagnostics

* Revert "revert: restore pre-fix OpenVPN NE flow"

This reverts commit ae99cc77e9fa982c20b15e4ca843bfebe0916942.

* chore: remove openvpn config processing

---------

Co-authored-by: vkamn <vk@amnezia.org>
2026-04-08 12:37:52 +08:00
lunardunno
cd50e0b8a5 fix: full server cleanup (#2446)
* Fix: full server cleanup

* Cleaning by REPOSITORY:TAG
2026-04-08 12:27:06 +08:00
vkamn
78f504e35c feat: new services description (#2412)
* feat: iap for apple now use storekit2

* fix: fixed error 101 on connection event

* feat: enhance StoreKit2Helper to handle entitlements and improve restore service from App Store functionality

* chore: add isInAppPurchase and isTestPurchase in primary config

* refactor: use end_date from primary config for renew ui

* fix: hide renew button for free

* fix: hide renew button for appstore purchases

* feat: add new premium info page

* feat: add new free info page

* chore: minor fixes

* refactor: move plan and benefits into separate models

* fix: fixed expired status when configs without an end date

* feat: add trial api support

* chore: add api message parsing for 422 error

* feat: move privacy policy and term of use to gateway

* feat: add iap support for new premium info page

* chore: minor fixes

* chore: minor fix

* chore: minor fixes

* feat: additional parsing for storekit subscription plans

* chore: minor codestyle fixes

* chore: simplify benefits

* chore: hide extend buttons on external premium

* feat: add trial error processing

* fix: remove wrong check from tiral handler

* chore: cleanup

---------

Co-authored-by: spectrum <yyy@amnezia.org>
2026-04-08 12:21:12 +08:00
NickVs2015
bf3d11e5c4 feat: renewal new status logic (#2409)
* fix: renewal add status logic

* fix: wakeup activity resumed android
2026-03-25 19:48:32 +08:00
NickVs2015
9a0222aee3 fix: ui fixes for renewal subscription (#2406) 2026-03-25 12:34:42 +08:00
NickVs2015
f0f0f7c5be feat: add subscription renewal (#2389)
* feat: add renewal subsribe

* fix: after review
2026-03-24 22:45:02 +08:00
NickVs2015
36b1a863bf fix: black screen resume / pause (#2400) 2026-03-24 22:13:31 +08:00
yyy-amnezia
4103c5bbcf refactor: extract and simplify OpenVPN reachability and network change handling logic (#2402) 2026-03-24 22:12:59 +08:00
vkamn
fa69da6d56 chore: send app version in services request (#2403) 2026-03-24 20:25:04 +08:00
yyy-amnezia
aaf2c9ddeb feat: add Xray split tunnel support for iOS PacketTunnelProvider (#2332) 2026-03-24 16:07:36 +08:00
Mitternacht822
dbbc7119ec feat: add warning info for ssh keys (#2252)
* fix: fixed da typo

* feat: added warning about available ssh keys info
2026-03-24 16:06:40 +08:00
vkamn
c57162c4cc feat: add base amnezia trial support (#2366)
* feat: add base amnezia trial support

* feat: add external-trial
2026-03-24 10:29:51 +08:00
NickVs2015
40e39895c9 fix openfile deadlock (#2373) 2026-03-21 11:46:46 +08:00
vkamn
ec3ab2a03c chore: update licnese file (#2376) 2026-03-20 21:04:13 +08:00
yyy-amnezia
ddecfcad26 fix: apple platform network switch fix (#2359)
* Apple platform network switch fix

* macos_ne exclusion fixed
2026-03-20 20:51:36 +08:00
NickVs2015
67bd880cdf fix: swap buffers error (#2347) 2026-03-16 13:03:20 +08:00
vkamn
477afb9d85 chore: bump version (#2336) 2026-03-10 22:22:37 +08:00
NickVs2015
f969fcdbb8 fix: restore dpad functionality ATV (#2335) 2026-03-10 22:19:55 +08:00
vkamn
b0ca16d861 chore: bump version (#2331) 2026-03-09 18:29:56 +08:00
NickVs2015
9963359948 fix: disable gamepad for GP (#2321) 2026-03-09 17:39:50 +08:00
vkamn
ca639d293d chore: bump version (#2319) 2026-03-06 23:11:03 +08:00
NickVs2015
83d045af64 fix: GP requrements (#2312) 2026-03-06 17:05:16 +08:00
NickVs2015
aea8ff4961 fix: add handle handleContextCreationFailure (#2309) 2026-03-03 22:04:45 +08:00
vkamn
1892db4375 fix: remove nested qeventloop from isConfigValid (also rename to validateConfig) (#2305)
* fix: remove nested qeventloop from isConfigValid (also rename to validateConfig)

* chore: bump version
2026-03-03 20:58:32 +08:00
NickVs2015
c86a641e05 fix: add suppord android 9 gamepad and remote control (#2302) 2026-03-03 15:14:51 +08:00
vkamn
f1e4811016 chore: update ru translation 2026-02-27 23:54:39 +08:00
vkamn
bc79cf17da Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into chore/merge-with-upstream 2026-02-27 23:47:57 +08:00
vkamn
befb2bf19a chore: bump version (#2295) 2026-02-27 23:33:37 +08:00
vkamn
7ad6bc340c chore: add translations for ru (#2285)
* chore: add translations for ru

* chore: text fixes
2026-02-27 20:00:31 +08:00
vkamn
9164e38c34 fix: restore backup android (#2291)
* fix: fixed restore backup on android

* chore: add resume helper for android

* chore: add ResumeHelper.runWhenActive call after all native android dialogs

* fix: add permission for tv file picker

* fix: add file picker handler in kotlin

---------

Co-authored-by: NickVs2015 <nv@amnezia.org>
2026-02-27 18:43:36 +08:00
vkamn
8f7559f01b chore: revert PR #2222 (#2290) 2026-02-27 14:29:25 +08:00
vkamn
af56200735 fix: fixed adding s3 s4 when updating the server conf for awg lagacy (#2289) 2026-02-27 14:11:40 +08:00
vkamn
3874050fae fix: again fixed s3, s4 ranges (#2288) 2026-02-27 13:37:49 +08:00
vkamn
3087163e34 fix: fixed s3, s4 ranges (#2283) 2026-02-26 22:31:41 +08:00
Mitternacht822
1fa152845c fix: generate native awg config as qr series (#2221) 2026-02-26 22:31:18 +08:00