From 313ceed1d058c8ff1e18313ee445c59ef750156a Mon Sep 17 00:00:00 2001 From: pokamest Date: Sun, 12 Dec 2021 14:42:25 +0300 Subject: [PATCH] StartPageLogic fix --- client/android/build.gradle | 8 ++------ client/defines.h | 4 ++-- client/ui/pages_logic/StartPageLogic.cpp | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/client/android/build.gradle b/client/android/build.gradle index 92d34e56..236f0b40 100644 --- a/client/android/build.gradle +++ b/client/android/build.gradle @@ -38,13 +38,9 @@ apply plugin: 'kotlinx-serialization' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) implementation 'androidx.core:core-ktx:1.1.0' - implementation 'com.android.installreferrer:installreferrer:2.2' - implementation 'com.android.billingclient:billing-ktx:4.0.0' implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0-alpha02" implementation "androidx.security:security-crypto:1.1.0-alpha03" implementation "androidx.security:security-identity-credential:1.0.0-alpha02" - implementation 'com.adjust.sdk:adjust-android:4.28.2' - implementation 'com.google.android.gms:play-services-ads-identifier:17.0.1' implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2" coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.0.10" } @@ -106,8 +102,8 @@ android { resConfig "en" minSdkVersion = 24 targetSdkVersion = 30 - versionCode 2 // Change to a higher number - versionName "2.0.1" // Change to a higher number + versionCode 5 // Change to a higher number + versionName "2.0.5" // Change to a higher number } buildTypes { diff --git a/client/defines.h b/client/defines.h index b4790d61..c2848d6f 100644 --- a/client/defines.h +++ b/client/defines.h @@ -4,7 +4,7 @@ #define APPLICATION_NAME "AmneziaVPN" #define SERVICE_NAME "AmneziaVPN-service" #define ORGANIZATION_NAME "AmneziaVPN.ORG" -#define APP_MAJOR_VERSION "2.0.1" -#define APP_VERSION "2.0.1.0" +#define APP_MAJOR_VERSION "2.0.5" +#define APP_VERSION "2.0.5.0" #endif // DEFINES_H diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp index 68a3d00c..ad7b985b 100644 --- a/client/ui/pages_logic/StartPageLogic.cpp +++ b/client/ui/pages_logic/StartPageLogic.cpp @@ -167,6 +167,7 @@ void StartPageLogic::onPushButtonImport() m_settings.addServer(o); m_settings.setDefaultServer(m_settings.serversCount() - 1); + emit uiLogic()->goToPage(Page::Vpn); emit uiLogic()->setStartPage(Page::Vpn); } else {