diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b1433e0..f8e1391e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) set(PROJECT AmneziaVPN) -project(${PROJECT} VERSION 4.4.1.2 +project(${PROJECT} VERSION 4.4.1.3 DESCRIPTION "AmneziaVPN" HOMEPAGE_URL "https://amnezia.org/" ) @@ -11,7 +11,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 47) +set(APP_ANDROID_VERSION_CODE 48) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(MZ_PLATFORM_NAME "linux") diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt index 2fa21880..629fdf77 160000 --- a/client/3rd-prebuilt +++ b/client/3rd-prebuilt @@ -1 +1 @@ -Subproject commit 2fa21880b9e5059cf9e8856c778bad97dcad3c91 +Subproject commit 629fdf77735506c904bb1449a3ed73de7d1f93f6 diff --git a/client/cmake/android.cmake b/client/cmake/android.cmake index ec47a38b..fe4a607c 100644 --- a/client/cmake/android.cmake +++ b/client/cmake/android.cmake @@ -50,5 +50,7 @@ foreach(abi IN ITEMS ${QT_ANDROID_ABIS}) ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libovpnutil.so ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/librsapss.so ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/libssh/android/${abi}/libssh.so + ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl3/android/${abi}/libcrypto_3.so + ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl3/android/${abi}/libssl_3.so ) endforeach() diff --git a/client/main.cpp b/client/main.cpp index 54d26bdb..77c91fbc 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -26,9 +26,10 @@ int main(int argc, char *argv[]) AllowSetForegroundWindow(ASFW_ANY); #endif -// QTBUG-95974 QTBUG-95764 QTBUG-102168 #ifdef Q_OS_ANDROID + // QTBUG-95974 QTBUG-95764 QTBUG-102168 qputenv("QT_ANDROID_DISABLE_ACCESSIBILITY", "1"); + qputenv("ANDROID_OPENSSL_SUFFIX", "_3"); #endif #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)