Fix in AndroidController [NO CI]

Bugfix/macos fixes (#247 )
* Icon for macos and tiny fixes * Macos deploy build fix
2026-07-03 14:07:39 +02:00 · 2023-06-18 17:49:03 +01:00 · 2023-05-28 16:24:00 +01:00
2 changed files with 7 additions and 7 deletions
@@ -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()
@@ -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
Author	SHA1	Message	Date
Mazay B	1b75b68373	Fix in AndroidController [NO CI]	2023-06-18 17:49:03 +01:00
pokamest	a116774104	Bugfix/macos fixes (#247 ) * Icon for macos and tiny fixes * Macos deploy build fix	2023-05-28 16:24:00 +01:00