AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix in AndroidController [NO CI]

Browse source
This commit is contained in:
Mazay B 2023-06-18 17:49:03 +01:00
parent a116774104
commit 1b75b68373
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/android/build.gradle
View file

@ -136,9 +136,9 @@ android {
defaultConfig { defaultConfig {
resConfig "en" resConfig "en"
minSdkVersion = 24 minSdkVersion = 24
targetSdkVersion = 31 targetSdkVersion = 34
versionCode 10 // Change to a higher number versionCode 21 // Change to a higher number
versionName "2.0.10" // Change to a higher number versionName "3.0.7" // Change to a higher number
javaCompileOptions.annotationProcessorOptions.arguments = [ javaCompileOptions.annotationProcessorOptions.arguments = [
"room.schemaLocation": "${qtAndroidDir}/schemas".toString() "room.schemaLocation": "${qtAndroidDir}/schemas".toString()

6
client/ui/uilogic.cpp
View file

@ -133,12 +133,12 @@ void UiLogic::initializeUiLogic()
connect(AndroidController::instance(), &AndroidController::initialized, [this](bool status, bool connected, const QDateTime& connectionDate) { connect(AndroidController::instance(), &AndroidController::initialized, [this](bool status, bool connected, const QDateTime& connectionDate) {
if (connected) { if (connected) {
pageLogic<VpnLogic>()->onConnectionStateChanged(VpnProtocol::Connected); pageLogic<VpnLogic>()->onConnectionStateChanged(VpnProtocol::Connected);
m_vpnConnection->restoreConnection(); if (m_vpnConnection) m_vpnConnection->restoreConnection();
} }
}); });
if (!AndroidController::instance()->initialize(pageLogic<StartPageLogic>())) { if (!AndroidController::instance()->initialize(pageLogic<StartPageLogic>())) {
qCritical() << QString("Init failed") ; qCritical() << QString("Init failed");
emit VpnProtocol::Error; if (m_vpnConnection) m_vpnConnection->connectionStateChanged(VpnProtocol::Error);
return; return;
} }
#endif #endif