From 1b75b68373e621b6c56692fc7ea7bbcfd892f050 Mon Sep 17 00:00:00 2001
From: Mazay B <pokamest@gmail.com>
Date: Sun, 18 Jun 2023 17:49:03 +0100
Subject: [PATCH] Fix in AndroidController [NO CI]

---
 client/android/build.gradle | 6 +++---
 client/ui/uilogic.cpp       | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/android/build.gradle b/client/android/build.gradle
index a957f89f..88bcb9b0 100644
--- a/client/android/build.gradle
+++ b/client/android/build.gradle
@@ -136,9 +136,9 @@ android {
     defaultConfig {
         resConfig "en"
         minSdkVersion = 24
-        targetSdkVersion = 31
-        versionCode 10 // Change to a higher number
-        versionName "2.0.10" // Change to a higher number
+        targetSdkVersion = 34
+        versionCode 21 // Change to a higher number
+        versionName "3.0.7" // Change to a higher number
 
         javaCompileOptions.annotationProcessorOptions.arguments = [
             "room.schemaLocation": "${qtAndroidDir}/schemas".toString()
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index ceb46930..0919b3a8 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -133,13 +133,13 @@ void UiLogic::initializeUiLogic()
     connect(AndroidController::instance(), &AndroidController::initialized, [this](bool status, bool connected, const QDateTime& connectionDate) {
         if (connected) {
             pageLogic<VpnLogic>()->onConnectionStateChanged(VpnProtocol::Connected);
-            m_vpnConnection->restoreConnection();
+            if (m_vpnConnection) m_vpnConnection->restoreConnection();
         }
     });
     if (!AndroidController::instance()->initialize(pageLogic<StartPageLogic>())) {
-         qCritical() << QString("Init failed") ;
-         emit VpnProtocol::Error;
-         return;
+        qCritical() << QString("Init failed");
+        if (m_vpnConnection) m_vpnConnection->connectionStateChanged(VpnProtocol::Error);
+        return;
     }
 #endif