Skip to content

Commit

Permalink
Merge pull request #382 from amnezia-vpn/feature/split-tunnel-mobile
Browse files Browse the repository at this point in the history
Split tunnel for missed Protocol/OS
  • Loading branch information
pokamest committed Oct 29, 2023
2 parents 7f2cf70 + 2fc3387 commit 08c1cf2
Show file tree
Hide file tree
Showing 25 changed files with 1,278 additions and 338 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)

set(PROJECT AmneziaVPN)

project(${PROJECT} VERSION 4.0.8.6
project(${PROJECT} VERSION 4.1.0.0
DESCRIPTION "AmneziaVPN"
HOMEPAGE_URL "https://amnezia.org/"
)
Expand Down
12 changes: 1 addition & 11 deletions client/amnezia_application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -296,17 +296,7 @@ void AmneziaApplication::initModels()

m_sitesModel.reset(new SitesModel(m_settings, this));
m_engine->rootContext()->setContextProperty("SitesModel", m_sitesModel.get());
connect(m_containersModel.get(), &ContainersModel::defaultContainerChanged, this, [this]() {
if ((m_containersModel->getDefaultContainer() == DockerContainer::WireGuard
|| m_containersModel->getDefaultContainer() == DockerContainer::Awg)
&& m_sitesModel->isSplitTunnelingEnabled()) {
m_sitesModel->toggleSplitTunneling(false);
emit m_pageController->showNotificationMessage(
tr("Split tunneling for %1 is not implemented, the option was disabled")
.arg(ContainerProps::containerHumanNames().value(m_containersModel->getDefaultContainer())));
}
});


m_protocolsModel.reset(new ProtocolsModel(m_settings, this));
m_engine->rootContext()->setContextProperty("ProtocolsModel", m_protocolsModel.get());

Expand Down
4 changes: 2 additions & 2 deletions client/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ android {
resConfig "en"
minSdkVersion = 24
targetSdkVersion = 34
versionCode 37 // Change to a higher number
versionName "4.0.8" // Change to a higher number
versionCode 39 // Change to a higher number
versionName "4.1.0" // Change to a higher number

javaCompileOptions.annotationProcessorOptions.arguments = [
"room.schemaLocation": "${qtAndroidDir}/schemas".toString()
Expand Down
Loading

0 comments on commit 08c1cf2

Please sign in to comment.