From d417fa58ab74e14483341efcfbeedca16dc96acd Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 14 Dec 2022 18:52:19 +0300
Subject: [PATCH 01/49] OpenVPN bandwidth counter for Android

---
 .../src/org/amnezia/vpn/OpenVPNThreadv3.kt    | 25 +++++++++++
 .../android/src/org/amnezia/vpn/VPNService.kt | 43 +++++++++++++++++--
 .../platforms/android/android_controller.cpp  | 30 ++++++++++---
 client/platforms/android/android_controller.h |  8 ++++
 client/protocols/android_vpnprotocol.cpp      | 12 ++++--
 client/protocols/android_vpnprotocol.h        |  3 ++
 client/vpnconnection.cpp                      |  1 +
 7 files changed, 108 insertions(+), 14 deletions(-)

diff --git a/client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt b/client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt
index f40f95365..39e077dd1 100644
--- a/client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt
+++ b/client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt
@@ -31,6 +31,31 @@ class OpenVPNThreadv3(var service: VPNService): ClientAPI_OpenVPNClient(), Runna
     private var mAlreadyInitialised = false
     private var mService: VPNService = service
 
+    private var bytesInIndex = -1
+    private var bytesOutIndex = -1
+
+    init {
+        findConfigIndicies()
+    }
+
+    private fun findConfigIndicies() {
+        val n: Int = stats_n()
+
+        for (i in 0 until n) {
+            val name: String = stats_name(i)
+            if (name == "BYTES_IN") bytesInIndex = i
+            if (name == "BYTES_OUT") bytesOutIndex = i
+        }
+    }
+
+    fun getTotalRxBytes(): Long {
+        return stats_value(bytesInIndex)
+    }
+
+    fun getTotalTxBytes(): Long {
+        return stats_value(bytesOutIndex)
+    }
+
     override fun run() {
 
         val config: ClientAPI_Config = ClientAPI_Config()
diff --git a/client/android/src/org/amnezia/vpn/VPNService.kt b/client/android/src/org/amnezia/vpn/VPNService.kt
index 23e9ff0c5..1d0adb423 100644
--- a/client/android/src/org/amnezia/vpn/VPNService.kt
+++ b/client/android/src/org/amnezia/vpn/VPNService.kt
@@ -319,17 +319,52 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
             mBinder.dispatchEvent(VPNServiceBinder.EVENTS.disconnected, "")
             mConnectionTime = 0
         }
+
     val status: JSONObject
         get() {
             val deviceIpv4: String = ""
+
+            val status = when (mProtocol) {
+                "openvpn" -> {
+                    if (mOpenVPNThreadv3 == null) {
+                        Status(null, null, null, null)
+                    } else {
+                        val rx = mOpenVPNThreadv3?.getTotalRxBytes() ?: ""
+                        val tx = mOpenVPNThreadv3?.getTotalTxBytes() ?: ""
+
+                        Status(
+                            rx.toString(),
+                            tx.toString(),
+                            if (mConfig!!.has("server")) { mConfig?.getJSONObject("server")?.getString("ipv4Gateway") } else {""},
+                            if (mConfig!!.has("device")) { mConfig?.getJSONObject("device")?.getString("ipv4Address") } else {""}
+                        )
+                    }
+                }
+                else -> {
+                    Status(
+                        getConfigValue("rx_bytes"),
+                        getConfigValue("tx_bytes"),
+                        mConfig?.getJSONObject("server")?.getString("ipv4Gateway"),
+                        mConfig?.getJSONObject("device")?.getString("ipv4Address")
+                    )
+                }
+            }
+
             return JSONObject().apply {
-                putOpt("rx_bytes", getConfigValue("rx_bytes"))
-                putOpt("tx_bytes", getConfigValue("tx_bytes"))
-                putOpt("endpoint", mConfig?.getJSONObject("server")?.getString("ipv4Gateway"))
-                putOpt("deviceIpv4", mConfig?.getJSONObject("device")?.getString("ipv4Address"))
+                putOpt("rx_bytes", status.rxBytes)
+                putOpt("tx_bytes", status.txBytes)
+                putOpt("endpoint", status.endpoint)
+                putOpt("deviceIpv4", status.device)
             }
         }
 
+    data class Status(
+        var rxBytes: String?,
+        var txBytes: String?,
+        var endpoint: String?,
+        var device: String?
+    )
+
     /*
     * Checks if the VPN Permission is given.
     * If the permission is given, returns true
diff --git a/client/platforms/android/android_controller.cpp b/client/platforms/android/android_controller.cpp
index af30fe05e..0a0556735 100644
--- a/client/platforms/android/android_controller.cpp
+++ b/client/platforms/android/android_controller.cpp
@@ -52,7 +52,7 @@ constexpr auto PERMISSIONHELPER_CLASS =
 AndroidController::AndroidController():
       m_binder(this)
 {
-
+    connect(this, &AndroidController::scheduleStatusCheckSignal, this, &AndroidController::scheduleStatusCheckSlot);
 }
 
 AndroidController* AndroidController::instance() {
@@ -237,6 +237,14 @@ void AndroidController::setVpnConfig(const QJsonObject &newVpnConfig)
     m_vpnConfig = newVpnConfig;
 }
 
+void AndroidController::scheduleStatusCheckSlot()
+{
+    QTimer::singleShot(1000, [this]() {
+        if (isConnected) {
+            checkStatus();
+        }
+    });
+}
 
 /**
  * @brief AndroidController::VPNBinder::onTransact
@@ -271,22 +279,30 @@ bool AndroidController::VPNBinder::onTransact(int code,
     case EVENT_CONNECTED:
       qDebug() << "Transact: connected";
       emit m_controller->connectionStateChanged(VpnProtocol::Connected);
+      m_controller->isConnected = true;
+      emit m_controller->scheduleStatusCheckSignal();
       break;
     case EVENT_DISCONNECTED:
       qDebug() << "Transact: disconnected";
       emit m_controller->connectionStateChanged(VpnProtocol::Disconnected);
+      m_controller->isConnected = false;
       break;
     case EVENT_STATISTIC_UPDATE:
+    {
       qDebug() << "Transact:: update";
 
-      // Data is here a JSON String
       doc = QJsonDocument::fromJson(data.readData());
-      // TODO update counters
-//      emit m_controller->statusUpdated(doc.object()["endpoint"].toString(),
-//                                       doc.object()["deviceIpv4"].toString(),
-//                                       doc.object()["totalTX"].toInt(),
-//                                       doc.object()["totalRX"].toInt());
+
+      QString rx = doc.object()["rx_bytes"].toString();
+      QString tx = doc.object()["tx_bytes"].toString();
+      QString endpoint = doc.object()["endpoint"].toString();
+      QString deviceIPv4 = doc.object()["deviceIpv4"].toString();
+
+      emit m_controller->statusUpdated(rx, tx, endpoint, deviceIPv4);
+      emit m_controller->scheduleStatusCheckSignal();
+
       break;
+    }
     case EVENT_BACKEND_LOGS:
       qDebug() << "Transact: backend logs";
 
diff --git a/client/platforms/android/android_controller.h b/client/platforms/android/android_controller.h
index c2a653810..27ec2e125 100644
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@@ -53,7 +53,11 @@ signals:
     void initialized(bool status, bool connected,
                      const QDateTime& connectionDate);
 
+    void statusUpdated(QString totalRx, QString totalTx, QString endpoint, QString deviceIPv4);
+    void scheduleStatusCheckSignal();
+
 protected slots:
+    void scheduleStatusCheckSlot();
 
 protected:
 
@@ -84,6 +88,10 @@ private:
 
     VPNBinder m_binder;
 
+    bool isConnected = false;
+
+    void scheduleStatusCheck();
+
     static void startActivityForResult(JNIEnv* env, jobject /*thiz*/, jobject intent);
 };
 
diff --git a/client/protocols/android_vpnprotocol.cpp b/client/protocols/android_vpnprotocol.cpp
index 66e2eaf53..f6ae75a5e 100644
--- a/client/protocols/android_vpnprotocol.cpp
+++ b/client/protocols/android_vpnprotocol.cpp
@@ -23,9 +23,7 @@
 AndroidVpnProtocol::AndroidVpnProtocol(Proto protocol, const QJsonObject &configuration, QObject* parent)
     : VpnProtocol(configuration, parent),
       m_protocol(protocol)
-{
-
-}
+{ }
 
 ErrorCode AndroidVpnProtocol::start()
 {
@@ -39,3 +37,11 @@ void AndroidVpnProtocol::stop()
     AndroidController::instance()->stop();
 }
 
+void AndroidVpnProtocol::connectionDataUpdated(QString totalRx, QString totalTx, QString endpoint, QString deviceIPv4)
+{
+    quint64 rxBytes = totalRx.toLongLong();
+    quint64 txBytes = totalTx.toLongLong();
+
+    setBytesChanged(rxBytes, txBytes);
+}
+
diff --git a/client/protocols/android_vpnprotocol.h b/client/protocols/android_vpnprotocol.h
index cdcff2c6b..c9599f5d7 100644
--- a/client/protocols/android_vpnprotocol.h
+++ b/client/protocols/android_vpnprotocol.h
@@ -25,6 +25,9 @@ public:
 signals:
 
 
+public slots:
+    void connectionDataUpdated(QString totalRx, QString totalTx, QString endpoint, QString deviceIPv4);
+
 protected slots:
 
 protected:
diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 286ffc8c6..38e0b7408 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -362,6 +362,7 @@ void VpnConnection::connectToVpn(int serverIndex,
     Proto proto = ContainerProps::defaultProtocol(container);
     AndroidVpnProtocol *androidVpnProtocol = new AndroidVpnProtocol(proto, m_vpnConfiguration);
     connect(AndroidController::instance(), &AndroidController::connectionStateChanged, androidVpnProtocol, &AndroidVpnProtocol::setConnectionState);
+    connect(AndroidController::instance(), &AndroidController::statusUpdated, androidVpnProtocol, &AndroidVpnProtocol::connectionDataUpdated);
 
     m_vpnProtocol.reset(androidVpnProtocol);
 #elif defined Q_OS_IOS

From 54dc363231e41dacb4aa9d14d6c60cead5ef4fb3 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Thu, 15 Dec 2022 18:46:15 +0300
Subject: [PATCH 02/49] iOS fix + Android connection status restoration fix

---
 .../android/src/org/amnezia/vpn/VPNService.kt | 18 ++++++++++----
 .../platforms/android/android_controller.cpp  | 24 +++++++++++++++----
 client/protocols/ios_vpnprotocol.h            |  1 +
 client/protocols/ios_vpnprotocol.mm           |  9 +++----
 client/vpnconnection.cpp                      |  8 +------
 client/vpnconnection.h                        |  2 --
 6 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/client/android/src/org/amnezia/vpn/VPNService.kt b/client/android/src/org/amnezia/vpn/VPNService.kt
index 1d0adb423..9db686051 100644
--- a/client/android/src/org/amnezia/vpn/VPNService.kt
+++ b/client/android/src/org/amnezia/vpn/VPNService.kt
@@ -41,6 +41,7 @@ import java.io.Closeable
 import java.io.File
 import java.io.FileDescriptor
 import java.io.IOException
+import java.lang.Exception
 import android.net.VpnService as BaseVpnService
 
 
@@ -306,9 +307,16 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
             return mConnectionTime
         }
 
-    var isUp: Boolean
+    var isUp: Boolean = false
         get() {
-            return currentTunnelHandle >= 0
+            return when (mProtocol) {
+                "openvpn" -> {
+                    field
+                }
+                else -> {
+                    currentTunnelHandle >= 0
+                }
+            }
         }
         set(value) {
             if (value) {
@@ -344,8 +352,8 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
                     Status(
                         getConfigValue("rx_bytes"),
                         getConfigValue("tx_bytes"),
-                        mConfig?.getJSONObject("server")?.getString("ipv4Gateway"),
-                        mConfig?.getJSONObject("device")?.getString("ipv4Address")
+                        if (mConfig!!.has("server")) { mConfig?.getJSONObject("server")?.getString("ipv4Gateway") } else {""},
+                        if (mConfig!!.has("server")) {mConfig?.getJSONObject("device")?.getString("ipv4Address") } else {""}
                     )
                 }
             }
@@ -712,6 +720,8 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
 
     private fun startOpenVpn() {
         mOpenVPNThreadv3 = OpenVPNThreadv3(this)
+        isUp = true
+
         Thread({
             mOpenVPNThreadv3?.run()
         }).start()
diff --git a/client/platforms/android/android_controller.cpp b/client/platforms/android/android_controller.cpp
index 0a0556735..e3d0a9b1f 100644
--- a/client/platforms/android/android_controller.cpp
+++ b/client/platforms/android/android_controller.cpp
@@ -266,16 +266,27 @@ bool AndroidController::VPNBinder::onTransact(int code,
   QString buffer;
   switch (code) {
     case EVENT_INIT:
+    {
       qDebug() << "Transact: init";
       doc = QJsonDocument::fromJson(data.readData());
-      emit m_controller->initialized(
-          true, doc.object()["connected"].toBool(),
-          QDateTime::fromMSecsSinceEpoch(
-              doc.object()["time"].toVariant().toLongLong()));
+
+      bool isConnected = doc.object()["connected"].toBool();
+      QDateTime time = QDateTime::fromMSecsSinceEpoch(
+                  doc.object()["time"].toVariant().toLongLong());
+
+      emit m_controller->initialized(true, isConnected, time);
+
       // Pass a localised version of the Fallback string for the Notification
       m_controller->setFallbackConnectedNotification();
 
+      m_controller->isConnected = isConnected;
+
+      if (isConnected) {
+          emit m_controller->scheduleStatusCheckSignal();
+      }
+
       break;
+    }
     case EVENT_CONNECTED:
       qDebug() << "Transact: connected";
       emit m_controller->connectionStateChanged(VpnProtocol::Connected);
@@ -299,7 +310,10 @@ bool AndroidController::VPNBinder::onTransact(int code,
       QString deviceIPv4 = doc.object()["deviceIpv4"].toString();
 
       emit m_controller->statusUpdated(rx, tx, endpoint, deviceIPv4);
-      emit m_controller->scheduleStatusCheckSignal();
+
+      if (m_controller->isConnected) {
+        emit m_controller->scheduleStatusCheckSignal();
+      }
 
       break;
     }
diff --git a/client/protocols/ios_vpnprotocol.h b/client/protocols/ios_vpnprotocol.h
index 2b2971f19..66c725ce4 100644
--- a/client/protocols/ios_vpnprotocol.h
+++ b/client/protocols/ios_vpnprotocol.h
@@ -36,6 +36,7 @@ public:
     void cleanupBackendLogs();
 
 signals:
+    void newTransmitedDataCount(quint64 rxBytes, quint64 txBytes);
 
 protected slots:
 
diff --git a/client/protocols/ios_vpnprotocol.mm b/client/protocols/ios_vpnprotocol.mm
index 8decd8853..876f01d1e 100644
--- a/client/protocols/ios_vpnprotocol.mm
+++ b/client/protocols/ios_vpnprotocol.mm
@@ -23,8 +23,10 @@ Proto currentProto = amnezia::Proto::Any;
 }
 
 IOSVpnProtocol::IOSVpnProtocol(Proto proto, const QJsonObject &configuration, QObject* parent)
-: VpnProtocol(configuration, parent),
-m_protocol(proto) {}
+: VpnProtocol(configuration, parent), m_protocol(proto)
+{
+    connect(this, &IOSVpnProtocol::newTransmitedDataCount, this, &IOSVpnProtocol::setBytesChanged);
+}
 
 IOSVpnProtocol* IOSVpnProtocol::instance() {
     return s_instance;
@@ -205,8 +207,7 @@ void IOSVpnProtocol::checkStatus()
         qDebug() << "ServerIpv4Gateway:" << QString::fromNSString(serverIpv4Gateway)
                     << "DeviceIpv4Address:" << QString::fromNSString(deviceIpv4Address)
                     << "RxBytes:" << rxBytes << "TxBytes:" << txBytes;
-        emit bytesChanged(rxBytes, txBytes);
-        
+        emit newTransmitedDataCount(rxBytes, txBytes);
     }];
 }
 
diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 38e0b7408..4468152d9 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -36,8 +36,6 @@ VpnConnection::VpnConnection(std::shared_ptr<Settings> settings,
     m_settings(settings),
     m_configurator(configurator),
     m_serverController(serverController),
-    m_receivedBytes(0),
-    m_sentBytes(0),
     m_isIOSConnected(false)
 {
 }
@@ -52,11 +50,7 @@ VpnConnection::~VpnConnection()
 
 void VpnConnection::onBytesChanged(quint64 receivedBytes, quint64 sentBytes)
 {
-    emit bytesChanged(receivedBytes - m_receivedBytes, sentBytes - m_sentBytes);
-
-    m_receivedBytes = receivedBytes;
-    m_sentBytes = sentBytes;
-
+    emit bytesChanged(receivedBytes, sentBytes);
 }
 
 void VpnConnection::onConnectionStateChanged(VpnProtocol::VpnConnectionState state)
diff --git a/client/vpnconnection.h b/client/vpnconnection.h
index c8ebdfad0..3a0d40646 100644
--- a/client/vpnconnection.h
+++ b/client/vpnconnection.h
@@ -93,8 +93,6 @@ private:
     QJsonObject m_vpnConfiguration;
     QJsonObject m_routeMode;
     QString m_remoteAddress;
-    quint64 m_receivedBytes;
-    quint64 m_sentBytes;
     bool m_isIOSConnected;  //remove later move to isConnected,
 
 #ifdef AMNEZIA_DESKTOP

From 6c614a4b3cb73820be0ec4fd46409277a0de9315 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Fri, 23 Dec 2022 17:32:20 +0300
Subject: [PATCH 03/49] Moving to Qt6: 1) removing of deprecated classes 2)
 update of IPC mechanism

---
 client/3rd/qtkeychain                         |   2 +-
 client/android/AndroidManifest.xml            | 147 +------
 client/android/build.gradle                   |  15 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 client/android/res/values/libs.xml            |  11 +-
 .../src/org/amnezia/vpn/AuthHelper.java       |   2 +-
 .../android/src/org/amnezia/vpn/VPNService.kt |  32 --
 .../src/org/amnezia/vpn/VPNServiceBinder.kt   |  49 ++-
 .../src/org/amnezia/vpn/qt/AmneziaApp.kt      |   4 +-
 .../src/org/amnezia/vpn/qt/VPNActivity.kt     | 205 +++++++--
 .../org/amnezia/vpn/qt/VPNApplication.java    |   2 +-
 .../src/org/amnezia/vpn/qt/VPNClientBinder.kt |  27 ++
 .../ftylitak/qzxing/QZXingLiveActivity.java   |   2 +-
 client/client.pro                             |  20 +-
 .../platforms/android/android_controller.cpp  | 401 +++++++-----------
 client/platforms/android/android_controller.h |  41 +-
 client/protocols/android_vpnprotocol.cpp      |  10 -
 client/protocols/android_vpnprotocol.h        |   6 -
 client/ui/pages_logic/ServerSettingsLogic.cpp |  17 +-
 client/ui/pages_logic/ServerSettingsLogic.h   |   5 +-
 client/ui/pages_logic/StartPageLogic.cpp      |   9 +-
 21 files changed, 478 insertions(+), 531 deletions(-)
 create mode 100644 client/android/src/org/amnezia/vpn/qt/VPNClientBinder.kt

diff --git a/client/3rd/qtkeychain b/client/3rd/qtkeychain
index f197cdb93..c6f0b6631 160000
--- a/client/3rd/qtkeychain
+++ b/client/3rd/qtkeychain
@@ -1 +1 @@
-Subproject commit f197cdb935b0cfd9881fdc6860874cb8379d1238
+Subproject commit c6f0b66318f8da6917fb4681103f7303b1836194
diff --git a/client/android/AndroidManifest.xml b/client/android/AndroidManifest.xml
index 55cffe204..18ffbd9b3 100644
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
-<manifest
-    package="org.amnezia.vpn"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionName="-- %%INSERT_VERSION_NAME%% --"
-    android:versionCode="-- %%INSERT_VERSION_CODE%% --"
-    android:installLocation="auto">
+<manifest package="org.amnezia.vpn" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
 
    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -23,34 +18,19 @@
 
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
-    <application
-        android:name=".qt.AmneziaApp"
-        android:hardwareAccelerated="true"
-        android:label="-- %%INSERT_APP_NAME%% --"
-        android:extractNativeLibs="true"
-        android:icon="@drawable/icon">
-        
-        <activity
-            android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
-            android:name=".qt.VPNActivity"
-            android:label="-- %%INSERT_APP_NAME%% --"
-            android:screenOrientation="unspecified"
-            android:launchMode="singleInstance"
-            android:taskAffinity=""
-            android:theme="@style/splashScreenTheme">
-            
+    <application android:name=".qt.AmneziaApp" android:hardwareAccelerated="true" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true" android:icon="@drawable/icon">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name=".qt.VPNActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleInstance" android:taskAffinity="" android:theme="@style/splashScreenTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-    
             <intent-filter android:label="AmneziaVPN">
-                <action android:name="android.intent.action.SEND" />
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.SEND"/>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
                 <data android:scheme="file"/>
                 <data android:scheme="content"/>
-                <data android:mimeType= "*/*"/>
+                <data android:mimeType="*/*"/>
                 <data android:host="*"/>
                 <data android:pathPattern=".*\\.vpn"/>
                 <data android:pathPattern=".*\\..*\\.vpn"/>
@@ -58,14 +38,13 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\.vpn"/>
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.vpn"/>
             </intent-filter>
-    
             <intent-filter android:label="AmneziaVPN">
-                <action android:name="android.intent.action.SEND" />
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.SEND"/>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
                 <data android:scheme="file"/>
                 <data android:scheme="content"/>
-                <data android:mimeType= "*/*"/>
+                <data android:mimeType="*/*"/>
                 <data android:host="*"/>
                 <data android:pathPattern=".*\\.cfg"/>
                 <data android:pathPattern=".*\\..*\\.cfg"/>
@@ -73,14 +52,13 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\.cfg"/>
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.cfg"/>
             </intent-filter>
-    
             <intent-filter android:label="AmneziaVPN">
-                <action android:name="android.intent.action.SEND" />
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.SEND"/>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
                 <data android:scheme="file"/>
                 <data android:scheme="content"/>
-                <data android:mimeType= "*/*"/>
+                <data android:mimeType="*/*"/>
                 <data android:host="*"/>
                 <data android:pathPattern=".*\\.conf"/>
                 <data android:pathPattern=".*\\..*\\.conf"/>
@@ -88,101 +66,22 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\.conf"/>
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.conf"/>
             </intent-filter>
-            
-            <!-- Application arguments -->
-            <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
-            <!-- Application arguments -->
+
             <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
-            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
-            <meta-data android:name="android.app.repository" android:value="default"/>
-            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
-            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
-            <!-- Deploy Qt libs as part of package -->
-            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
-            <!-- Run with local libs -->
-            <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
-            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
-            <meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
-            <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
-            <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
-            <!-- Used to specify custom system library path to run with local system libs -->
-            <!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
-            <!--  Messages maps -->
-            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
-            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
-            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
-            <meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
-            <!--  Messages maps -->
-            <!-- Splash screen -->
-            <!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation,
-                 then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and
-                 use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you
-                 are done populating your window with content. -->
-            <!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / -->
-            <!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / -->
-            <!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
-            <!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
-            <!-- Splash screen -->
-            <!-- Background running -->
-            <!-- Warning: changing this value to true may cause unexpected crashes if the
-                          application still try to draw after
-                          "applicationStateChanged(Qt::ApplicationSuspended)"
-                          signal is sent! -->
+            <meta-data android:name="android.app.extract_android_style" android:value="minimal" />
             <meta-data android:name="android.app.background_running" android:value="false"/>
-            <!-- Background running -->
-            <!-- auto screen scale factor -->
-            <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
-            <!-- auto screen scale factor -->
-            <!-- extract android style -->
-            <!-- available android:values :
-                * default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
-                * full - useful QWidget & Quick Controls 1 apps
-                * minimal - useful for Quick Controls 2 apps, it is much faster than "full"
-                * none - useful for apps that don't use any of the above Qt modules
-                -->
-            <meta-data android:name="android.app.extract_android_style" android:value="default"/>
-            <!-- extract android style -->
-            <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/splashscreen"/>
+
         </activity>
-        
-        <service
-            android:name=".VPNService"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            android:process=":QtOnlyProcess"
-            android:exported="true">
-            
-            <intent-filter>
-                <action android:name="android.net.VpnService"/>
-            </intent-filter>
-            
-            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
-            <meta-data android:name="android.app.repository" android:value="default"/>
-            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
-            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
-            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
-            <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
-            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
-            <meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
-            <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
-            <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
+
+        <service android:name=".VPNService" android:process=":QtOnlyProcess">
             <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
         </service>
-        
-        <service
-            android:name=".qt.VPNPermissionHelper"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            android:exported="true">
-            
+        <service android:name=".qt.VPNPermissionHelper">
             <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
         </service>
         <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
-    
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="org.amnezia.vpn.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            
+        <provider android:name="androidx.core.content.FileProvider" android:authorities="org.amnezia.vpn.fileprovider" android:exported="false" android:grantUriPermissions="true">
+
             <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/fileprovider"/>
         </provider>
     </application>
diff --git a/client/android/build.gradle b/client/android/build.gradle
index 121297202..69eda3e58 100644
--- a/client/android/build.gradle
+++ b/client/android/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
         classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -72,7 +72,11 @@ android {
 
     compileSdkVersion androidCompileSdkVersion.toInteger()
 
-    //buildToolsVersion '28.0.3'
+    buildToolsVersion androidBuildToolsVersion
+    ndkVersion androidNdkVersion
+
+    // Extract native libraries from the APK
+    packagingOptions.jniLibs.useLegacyPackaging true
 
     dexOptions {
        javaMaxHeapSize "3g"
@@ -81,9 +85,9 @@ android {
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
-            aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
-            res.srcDirs = [qt5AndroidDir + '/res', 'res']
+            java.srcDirs = [qtAndroidDir + '/src', 'src', 'java']
+            aidl.srcDirs = [qtAndroidDir + '/src', 'src', 'aidl']
+            res.srcDirs = [qtAndroidDir + '/res', 'res']
             resources.srcDirs = ['resources']
             renderscript.srcDirs = ['src']
             assets.srcDirs = ['assets']
@@ -139,6 +143,7 @@ android {
        debug {
            //applicationIdSuffix ".debug"
            //versionNameSuffix "-debug"
+           minifyEnabled false
            externalNativeBuild {
                cmake {
                    arguments "-DANDROID_PACKAGE_NAME=${groupName}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"
diff --git a/client/android/gradle/wrapper/gradle-wrapper.properties b/client/android/gradle/wrapper/gradle-wrapper.properties
index 4e1cc9db6..669386b87 100644
--- a/client/android/gradle/wrapper/gradle-wrapper.properties
+++ b/client/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/client/android/res/values/libs.xml b/client/android/res/values/libs.xml
index 6b1a4a2a0..fe63866f7 100644
--- a/client/android/res/values/libs.xml
+++ b/client/android/res/values/libs.xml
@@ -1,11 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <array name="qt_sources">
-        <item>https://download.qt.io/ministro/android/qt5/qt-5.14</item>
-    </array>
-
-    <!-- The following is handled automatically by the deployment tool. It should
-         not be edited manually. -->
+    <!-- DO NOT EDIT THIS: This file is populated automatically by the deployment tool. -->
 
     <array name="bundled_libs">
         <!-- %%INSERT_EXTRA_LIBS%% -->
@@ -19,4 +14,8 @@
         <!-- %%INSERT_LOCAL_LIBS%% -->
     </array>
 
+    <string name="static_init_classes"><!-- %%INSERT_INIT_CLASSES%% --></string>
+    <string name="use_local_qt_libs"><!-- %%USE_LOCAL_QT_LIBS%% --></string>
+    <string name="bundle_local_qt_libs"><!-- %%BUNDLE_LOCAL_QT_LIBS%% --></string>
+    <string name="system_libs_prefix"><!-- %%SYSTEM_LIBS_PREFIX%% --></string>
 </resources>
diff --git a/client/android/src/org/amnezia/vpn/AuthHelper.java b/client/android/src/org/amnezia/vpn/AuthHelper.java
index b30aa8f50..940d03c27 100644
--- a/client/android/src/org/amnezia/vpn/AuthHelper.java
+++ b/client/android/src/org/amnezia/vpn/AuthHelper.java
@@ -3,7 +3,7 @@ package org.amnezia.vpn;
 import android.content.Context;
 import android.app.KeyguardManager;
 import android.content.Intent;
-import org.qtproject.qt5.android.bindings.QtActivity;
+import org.qtproject.qt.android.bindings.QtActivity;
 
 
 import static android.content.Context.KEYGUARD_SERVICE;
diff --git a/client/android/src/org/amnezia/vpn/VPNService.kt b/client/android/src/org/amnezia/vpn/VPNService.kt
index 23e9ff0c5..a01e3852c 100644
--- a/client/android/src/org/amnezia/vpn/VPNService.kt
+++ b/client/android/src/org/amnezia/vpn/VPNService.kt
@@ -153,31 +153,6 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
     private var flags = 0
     private var startId = 0
 
-    private lateinit var mMessenger: Messenger
-
-    internal class ExternalConfigImportHandler(
-        context: Context,
-        private val serviceBinder: VPNServiceBinder,
-        private val applicationContext: Context = context.applicationContext
-    ) : Handler() {
-
-        override fun handleMessage(msg: Message) {
-            when (msg.what) {
-                IMPORT_COMMAND_CODE -> {
-                    val data = msg.data.getString(IMPORT_CONFIG_KEY)
-
-                    if (data != null) {
-                        serviceBinder.importConfig(data)
-                    }
-                }
-
-                else -> {
-                    super.handleMessage(msg)
-                }
-            }
-        }
-    }
-
     fun init() {
         if (mAlreadyInitialised) {
             return
@@ -216,13 +191,6 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
     override fun onBind(intent: Intent): IBinder {
         Log.v(tag, "Aman: onBind....................")
 
-        if (intent.action != null && intent.action == IMPORT_ACTION_CODE) {
-            Log.v(tag, "Service bind for import of config")
-            mMessenger = Messenger(ExternalConfigImportHandler(this, mBinder))
-            return mMessenger.binder
-        }
-
-        Log.v(tag, "Regular service bind")
         when (mProtocol) {
             "shadowsocks" -> {
                 when (intent.action) {
diff --git a/client/android/src/org/amnezia/vpn/VPNServiceBinder.kt b/client/android/src/org/amnezia/vpn/VPNServiceBinder.kt
index 640a0657f..239269a5b 100644
--- a/client/android/src/org/amnezia/vpn/VPNServiceBinder.kt
+++ b/client/android/src/org/amnezia/vpn/VPNServiceBinder.kt
@@ -33,6 +33,7 @@ class VPNServiceBinder(service: VPNService) : Binder() {
         const val setNotificationText = 8
         const val setFallBackNotification = 9
         const val shareConfig = 10
+        const val importConfig = 11
     }
 
     /**
@@ -75,13 +76,14 @@ class VPNServiceBinder(service: VPNService) : Binder() {
             ACTIONS.resumeActivate -> {
             // [data] is empty
             // Activate the current tunnel
-            try {
-                mResumeConfig?.let { this.mService.turnOn(it) }
+                Log.i(tag, "resume activate")
+                try {
+                    mResumeConfig?.let { this.mService.turnOn(it) }
                 } catch (e: Exception) {
                     Log.e(tag, "An Error occurred while enabling the VPN: ${e.localizedMessage}")
                 }
                 return true
-            }
+        }
 
             ACTIONS.deactivate -> {
                 // [data] here is empty
@@ -90,6 +92,7 @@ class VPNServiceBinder(service: VPNService) : Binder() {
             }
 
             ACTIONS.registerEventListener -> {
+                Log.i(tag, "register: start")
                 // [data] contains the Binder that we need to dispatch the Events
                 val binder = data.readStrongBinder()
                 mListener = binder
@@ -150,6 +153,23 @@ class VPNServiceBinder(service: VPNService) : Binder() {
                 return true
             }
 
+            ACTIONS.importConfig -> {
+                val buffer = data.readString()
+
+                val obj = JSONObject()
+                obj.put("config", buffer)
+
+                val resultString = obj.toString()
+
+                Log.i(tag, "Transact import config request")
+
+                if (mListener != null) {
+                    dispatchEvent(EVENTS.configImport, resultString)
+                } else {
+                    mImportedConfig = resultString
+                }
+            }
+
             IBinder.LAST_CALL_TRANSACTION -> {
                 Log.e(tag, "The OS Requested to shut down the VPN")
                 this.mService.turnOff()
@@ -176,9 +196,12 @@ class VPNServiceBinder(service: VPNService) : Binder() {
         try {
             mListener?.let {
                 if (it.isBinderAlive) {
+                    Log.i(tag, "Dispatching event: binder alive")
                     val data = Parcel.obtain()
                     data.writeByteArray(payload?.toByteArray(charset("UTF-8")))
                     it.transact(code, data, Parcel.obtain(), 0)
+                } else {
+                    Log.i(tag, "Dispatching event: binder NOT alive")
                 }
             }
         } catch (e: DeadObjectException) {
@@ -197,23 +220,7 @@ class VPNServiceBinder(service: VPNService) : Binder() {
         const val statisticUpdate = 3
         const val backendLogs = 4
         const val activationError = 5
-        const val configImport = 6
-    }
-
-    fun importConfig(config: String) {
-        val obj = JSONObject()
-        obj.put("config", config)
-
-        val resultString = obj.toString()
-
-        Log.i(tag, "Transact import config request")
-
-        if (mListener != null) {
-            Log.i(tag, "binder alive")
-            dispatchEvent(EVENTS.configImport, resultString)
-        } else {
-            Log.i(tag, "binder NOT alive")
-            mImportedConfig = resultString
-        }
+        const val permissionRequired = 6
+        const val configImport = 7
     }
 }
diff --git a/client/android/src/org/amnezia/vpn/qt/AmneziaApp.kt b/client/android/src/org/amnezia/vpn/qt/AmneziaApp.kt
index 7888f6d6d..24c33ffc3 100644
--- a/client/android/src/org/amnezia/vpn/qt/AmneziaApp.kt
+++ b/client/android/src/org/amnezia/vpn/qt/AmneziaApp.kt
@@ -3,8 +3,8 @@ package org.amnezia.vpn.qt
 import android.content.res.Configuration
 import org.amnezia.vpn.shadowsocks.core.Core
 import org.amnezia.vpn.shadowsocks.core.VpnManager
-import org.qtproject.qt5.android.bindings.QtActivity
-import org.qtproject.qt5.android.bindings.QtApplication
+import org.qtproject.qt.android.bindings.QtActivity
+import org.qtproject.qt.android.bindings.QtApplication
 import android.app.Application
 
 class AmneziaApp: Application() {
diff --git a/client/android/src/org/amnezia/vpn/qt/VPNActivity.kt b/client/android/src/org/amnezia/vpn/qt/VPNActivity.kt
index c5b5107e1..673c4b593 100644
--- a/client/android/src/org/amnezia/vpn/qt/VPNActivity.kt
+++ b/client/android/src/org/amnezia/vpn/qt/VPNActivity.kt
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.amnezia.vpn.qt;
 
 import android.Manifest
@@ -20,18 +24,33 @@ import org.amnezia.vpn.VPNServiceBinder
 import org.amnezia.vpn.IMPORT_COMMAND_CODE
 import org.amnezia.vpn.IMPORT_ACTION_CODE
 import org.amnezia.vpn.IMPORT_CONFIG_KEY
-import org.qtproject.qt5.android.bindings.QtActivity
+import org.qtproject.qt.android.bindings.QtActivity
 import java.io.*
 
-class VPNActivity : org.qtproject.qt5.android.bindings.QtActivity() {
+class VPNActivity : org.qtproject.qt.android.bindings.QtActivity() {
 
     private var configString: String? = null
-    private var vpnServiceBinder: Messenger? = null
+    private var vpnServiceBinder: IBinder? = null
     private var isBound = false
 
     private val TAG = "VPNActivity"
     private val STORAGE_PERMISSION_CODE = 42
 
+    companion object {
+        private lateinit var instance: VPNActivity
+
+        @JvmStatic fun getInstance(): VPNActivity {
+            return instance
+        }
+
+        @JvmStatic fun connectService() {
+            VPNActivity.getInstance().initServiceConnection()
+        }
+
+        @JvmStatic fun sendToService(actionCode: Int, body: String) {
+            VPNActivity.getInstance().dispatchParcel(actionCode, body)
+        }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         val newIntent = intent
@@ -42,6 +61,48 @@ class VPNActivity : org.qtproject.qt5.android.bindings.QtActivity() {
         }
 
         super.onCreate(savedInstanceState)
+
+        instance = this;
+    }
+
+    override fun getSystemService(name: String): Any? {
+        return if (Build.VERSION.SDK_INT >= 29 && name == "clipboard") {
+            // QT will always attempt to read the clipboard if content is there.
+            // since we have no use of the clipboard in android 10+
+            // we _can_  return null
+            // And we defnitly should since android 12 displays clipboard access.
+            null
+        } else {
+            super.getSystemService(name)
+        }
+    }
+
+    external fun handleBackButton(): Boolean
+
+    external fun onServiceMessage(actionCode: Int, body: String?)
+    external fun qtOnServiceConnected()
+    external fun qtOnServiceDisconnected()
+
+    private fun dispatchParcel(actionCode: Int, body: String) {
+        if (!isBound) {
+            Log.d(TAG, "dispatchParcel: not bound")
+            return
+        } else {
+            Log.d(TAG, "dispatchParcel: bound")
+        }
+
+        val out: Parcel = Parcel.obtain()
+        out.writeByteArray(body.toByteArray())
+
+        try {
+            vpnServiceBinder?.transact(actionCode, out, Parcel.obtain(), 0)
+        } catch (e: DeadObjectException) {
+            isBound = false
+            vpnServiceBinder = null
+            qtOnServiceDisconnected()
+        } catch (e: RemoteException) {
+            e.printStackTrace()
+        }
     }
 
     override fun onNewIntent(newIntent: Intent) {
@@ -63,19 +124,11 @@ class VPNActivity : org.qtproject.qt5.android.bindings.QtActivity() {
     override fun onResume() {
         super.onResume()
 
-        if (configString != null && !isBound) {
-            bindVpnService()
+        if (configString != null && isBound) {
+            sendImportConfigCommand()
         }
     }
 
-    override fun onPause() {
-        if (vpnServiceBinder != null && isBound) {
-            unbindService(connection)
-            isBound = false
-        }
-        super.onPause()
-    }
-
     private fun isReadStorageAllowed(): Boolean {
         val permissionStatus = ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE)
         return permissionStatus == PackageManager.PERMISSION_GRANTED
@@ -90,8 +143,15 @@ class VPNActivity : org.qtproject.qt5.android.bindings.QtActivity() {
             if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 Log.d(TAG, "Storage read permission granted")
 
+                if (configString == null) {
+                    configString = processIntent(intent, intent.action!!)
+                }
+
                 if (configString != null) {
-                    bindVpnService()
+                    Log.d(TAG, "not empty")
+                    sendImportConfigCommand()
+                } else {
+                    Log.d(TAG, "empty")
                 }
             } else {
                 Toast.makeText(this, "Oops you just denied the permission", Toast.LENGTH_LONG).show()
@@ -99,17 +159,6 @@ class VPNActivity : org.qtproject.qt5.android.bindings.QtActivity() {
         }
     }
 
-    private fun bindVpnService() {
-        try {
-            val intent = Intent(this, VPNService::class.java)
-            intent.action = IMPORT_ACTION_CODE
-
-            bindService(intent, connection, Context.BIND_AUTO_CREATE)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
     private fun processIntent(intent: Intent, action: String): String? {
         val scheme = intent.scheme
 
@@ -158,23 +207,35 @@ class VPNActivity : org.qtproject.qt5.android.bindings.QtActivity() {
         }
     }
 
+    private fun sendImportConfigCommand() {
+        if (configString != null) {
+            val msg: Parcel = Parcel.obtain()
+            msg.writeString(configString!!)
+
+            try {
+                vpnServiceBinder?.transact(ACTION_IMPORT_CONFIG, msg, Parcel.obtain(), 0)
+            } catch (e: RemoteException) {
+                e.printStackTrace()
+            }
+
+            configString = null
+        }
+    }
+
     private var connection: ServiceConnection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, binder: IBinder) {
-            vpnServiceBinder = Messenger(binder)
+            vpnServiceBinder = binder
 
-            if (configString != null) {
-                val msg: Message = Message.obtain(null, IMPORT_COMMAND_CODE, 0, 0)
-                val bundle = Bundle()
-                bundle.putString(IMPORT_CONFIG_KEY, configString!!)
-                msg.data = bundle
-
-                try {
-                    vpnServiceBinder?.send(msg)
-                } catch (e: RemoteException) {
-                    e.printStackTrace()
-                }
-
-                configString = null
+            // This is called when the connection with the service has been
+            // established, giving us the object we can use to
+            // interact with the service.  We are communicating with the
+            // service using a Messenger, so here we get a client-side
+            // representation of that from the raw IBinder object.
+            if (registerBinder()){
+                qtOnServiceConnected();
+            } else {
+                qtOnServiceDisconnected();
+                return
             }
 
             isBound = true
@@ -183,9 +244,75 @@ class VPNActivity : org.qtproject.qt5.android.bindings.QtActivity() {
         override fun onServiceDisconnected(className: ComponentName) {
             vpnServiceBinder = null
             isBound = false
+            qtOnServiceDisconnected();
         }
     }
 
+    private fun registerBinder(): Boolean {
+        val binder = VPNClientBinder()
+        val out: Parcel = Parcel.obtain()
+        out.writeStrongBinder(binder)
+
+        try {
+            // Register our IBinder Listener
+            vpnServiceBinder?.transact(ACTION_REGISTER_LISTENER, out, Parcel.obtain(), 0)
+            return true
+        } catch (e: DeadObjectException) {
+            isBound = false
+            vpnServiceBinder = null
+        } catch (e: RemoteException) {
+            e.printStackTrace()
+        }
+        return false
+    }
+
+    private fun initServiceConnection() {
+        // We already have a connection to the service,
+        // just need to re-register the binder
+        if (isBound && vpnServiceBinder!!.isBinderAlive() && registerBinder()) {
+            qtOnServiceConnected()
+            return
+        }
+
+        bindService(Intent(this, VPNService::class.java), connection, Context.BIND_AUTO_CREATE)
+    }
+
+    // TODO: Move all ipc codes into a shared lib.
+    // this is getting out of hand.
+    private val PERMISSION_TRANSACTION = 1337
+    private val ACTION_REGISTER_LISTENER = 3
+    private val ACTION_RESUME_ACTIVATE = 7
+    private val ACTION_IMPORT_CONFIG = 11
+    private val EVENT_PERMISSION_REQURED = 6
+    private val EVENT_DISCONNECTED = 2
+
+
+    fun onPermissionRequest(code: Int, data: Parcel?) {
+        if (code != EVENT_PERMISSION_REQURED) {
+            return
+        }
+
+        val x = Intent()
+        x.readFromParcel(data)
+
+        startActivityForResult(x, PERMISSION_TRANSACTION)
+    }
+
+    override protected fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == PERMISSION_TRANSACTION) {
+            // THATS US!
+            if (resultCode == RESULT_OK) {
+                // Prompt accepted, tell service to retry.
+                dispatchParcel(ACTION_RESUME_ACTIVATE, "")
+            } else {
+                // Tell the Client we've disconnected
+                onServiceMessage(EVENT_DISCONNECTED, "")
+            }
+            return
+        }
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         if (keyCode == KeyEvent.KEYCODE_BACK && event.repeatCount == 0) {
             onBackPressed()
diff --git a/client/android/src/org/amnezia/vpn/qt/VPNApplication.java b/client/android/src/org/amnezia/vpn/qt/VPNApplication.java
index 295146339..639b5a1e9 100644
--- a/client/android/src/org/amnezia/vpn/qt/VPNApplication.java
+++ b/client/android/src/org/amnezia/vpn/qt/VPNApplication.java
@@ -5,7 +5,7 @@ import androidx.annotation.NonNull;
 import org.amnezia.vpn.shadowsocks.core.Core;
 import org.amnezia.vpn.shadowsocks.core.VpnManager;
 
-public class VPNApplication extends org.qtproject.qt5.android.bindings.QtApplication {
+public class VPNApplication extends org.qtproject.qt.android.bindings.QtApplication {
     private static VPNApplication instance;
 
     @Override
diff --git a/client/android/src/org/amnezia/vpn/qt/VPNClientBinder.kt b/client/android/src/org/amnezia/vpn/qt/VPNClientBinder.kt
new file mode 100644
index 000000000..6a8fa086d
--- /dev/null
+++ b/client/android/src/org/amnezia/vpn/qt/VPNClientBinder.kt
@@ -0,0 +1,27 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.amnezia.vpn.qt
+
+import android.os.Binder
+import android.os.Parcel
+import android.util.Log
+
+const val permissionRequired = 6
+
+class VPNClientBinder() : Binder() {
+
+    override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean {
+        if (code == permissionRequired) {
+            VPNActivity.getInstance().onPermissionRequest(code, data)
+            return true
+        }
+
+        val buffer = data.createByteArray()
+        val stringData = buffer?.let { String(it) }
+        VPNActivity.getInstance().onServiceMessage(code, stringData)
+
+        return true
+    }
+}
diff --git a/client/android/src/org/ftylitak/qzxing/QZXingLiveActivity.java b/client/android/src/org/ftylitak/qzxing/QZXingLiveActivity.java
index 37ccb6ce3..b6a4649d3 100644
--- a/client/android/src/org/ftylitak/qzxing/QZXingLiveActivity.java
+++ b/client/android/src/org/ftylitak/qzxing/QZXingLiveActivity.java
@@ -2,7 +2,7 @@ package org.ftylitak.qzxing;
 
 import android.Manifest;
 import android.content.pm.PackageManager;
-import org.qtproject.qt5.android.bindings.QtActivity;
+import org.qtproject.qt.android.bindings.QtActivity;
 import static org.ftylitak.qzxing.Utilities.REQUEST_CAMERA;
 
 public class QZXingLiveActivity extends QtActivity {
diff --git a/client/client.pro b/client/client.pro
index f365cbec9..a5d1f4f5c 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -1,4 +1,4 @@
-QT += widgets core gui network xml remoteobjects quick svg quickcontrols2 core5compat
+QT += widgets core gui network xml remoteobjects quick svg quickcontrols2
 equals(QT_MAJOR_VERSION, 6): QT += core5compat
 
 TARGET = AmneziaVPN
@@ -46,6 +46,8 @@ HEADERS  += \
     debug.h \
     defines.h \
     managementserver.h \
+    platforms/android/androidutils.h \
+    platforms/android/androidvpnactivity.h \
     platforms/ios/MobileUtils.h \
     platforms/linux/leakdetector.h \
     protocols/protocols_defs.h \
@@ -108,6 +110,8 @@ SOURCES  += \
     debug.cpp \
     main.cpp \
     managementserver.cpp \
+    platforms/android/androidutils.cpp \
+    platforms/android/androidvpnactivity.cpp \
     platforms/ios/MobileUtils.cpp \
     platforms/linux/leakdetector.cpp \
     protocols/protocols_defs.cpp \
@@ -246,15 +250,12 @@ android {
     versionAtLeast(QT_VERSION, 6.0.0) {
         # We need to include qtprivate api's
         # As QAndroidBinder is not yet implemented with a public api
-        QT+=core-private
-        ANDROID_ABIS=ANDROID_TARGET_ARCH
-
-        # for not changing qtkeychain sources for qt6
-        QT -= androidextras
-    }
-    else {
-        QT += androidextras
+        QT += core-private
+        ANDROID_ABIS = $$ANDROID_TARGET_ARCH
     }
+#    else {
+#        QT += androidextras
+#    }
 
    DEFINES += MVPN_ANDROID
 
@@ -298,6 +299,7 @@ android {
       ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
    for (abi, ANDROID_ABIS): {
+
       equals(ANDROID_TARGET_ARCH,$$abi) {
          LIBS += $$PWD/3rd/OpenSSL/lib/android/$${abi}/libcrypto.a
          LIBS += $$PWD/3rd/OpenSSL/lib/android/$${abi}/libssl.a
diff --git a/client/platforms/android/android_controller.cpp b/client/platforms/android/android_controller.cpp
index 36ed9397e..543f28145 100644
--- a/client/platforms/android/android_controller.cpp
+++ b/client/platforms/android/android_controller.cpp
@@ -1,9 +1,7 @@
-//#include <QAndroidBinder>
-//#include <QAndroidIntent>
-//#include <QAndroidJniEnvironment>
-//#include <QAndroidJniObject>
-//#include <QAndroidParcel>
-//#include <QAndroidServiceConnection>
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #include <QDebug>
 #include <QHostAddress>
 #include <QJsonArray>
@@ -12,54 +10,119 @@
 #include <QRandomGenerator>
 #include <QTextCodec>
 #include <QTimer>
-//#include <QtAndroid>
-
-#include <QtCore/private/qandroidextras_p.h>
-
 
 #include "android_controller.h"
-#include "core/errorstrings.h"
+#include "private/qandroidextras_p.h"
 #include "ui/pages_logic/StartPageLogic.h"
 
-// Binder Codes for VPNServiceBinder
-// See also - VPNServiceBinder.kt
-// Actions that are Requestable
-const int ACTION_ACTIVATE = 1;
-const int ACTION_DEACTIVATE = 2;
-const int ACTION_REGISTER_LISTENER = 3;
-const int ACTION_REQUEST_STATISTIC = 4;
-const int ACTION_REQUEST_GET_LOG = 5;
-const int ACTION_REQUEST_CLEANUP_LOG = 6;
-const int ACTION_RESUME_ACTIVATE = 7;
-const int ACTION_SET_NOTIFICATION_TEXT = 8;
-const int ACTION_SET_NOTIFICATION_FALLBACK = 9;
-const int ACTION_SHARE_CONFIG = 10;
-
-// Event Types that will be Dispatched after registration
-const int EVENT_INIT = 0;
-const int EVENT_CONNECTED = 1;
-const int EVENT_DISCONNECTED = 2;
-const int EVENT_STATISTIC_UPDATE = 3;
-const int EVENT_BACKEND_LOGS = 4;
-const int EVENT_ACTIVATION_ERROR = 5;
-const int EVENT_CONFIG_IMPORT = 6;
+#include "androidvpnactivity.h"
+#include "androidutils.h"
 
 namespace {
 AndroidController* s_instance = nullptr;
 
 constexpr auto PERMISSIONHELPER_CLASS =
     "org/amnezia/vpn/qt/VPNPermissionHelper";
-
 }  // namespace
 
-AndroidController::AndroidController():
-      m_binder(this)
+AndroidController::AndroidController()
 {
+    s_instance = this;
 
+    auto activity = AndroidVPNActivity::instance();
+
+    connect(activity, &AndroidVPNActivity::serviceConnected, this, []() {
+        qDebug() << "Transact: service connected";
+        AndroidVPNActivity::sendToService(ServiceAction::ACTION_REQUEST_STATISTIC, "");
+    }, Qt::QueuedConnection);
+
+    connect(activity, &AndroidVPNActivity::eventInitialized, this,
+        [this](const QString& parcelBody) {
+            // We might get multiple Init events as widgets, or fragments
+            // might query this.
+            if (m_init) {
+                return;
+            }
+
+            qDebug() << "Transact: init";
+
+            m_init = true;
+
+            auto doc = QJsonDocument::fromJson(parcelBody.toUtf8());
+            qlonglong time = doc.object()["time"].toVariant().toLongLong();
+            emit initialized(
+                true, doc.object()["connected"].toBool(),
+                time > 0 ? QDateTime::fromMSecsSinceEpoch(time) : QDateTime());
+
+            setFallbackConnectedNotification();
+        }, Qt::QueuedConnection);
+
+    connect(activity, &AndroidVPNActivity::eventConnected, this,
+        [this](const QString& parcelBody) {
+            Q_UNUSED(parcelBody);
+            qDebug() << "Transact: connected";
+            emit connectionStateChanged(VpnProtocol::Connected);
+        }, Qt::QueuedConnection);
+
+    connect(activity, &AndroidVPNActivity::eventDisconnected, this,
+        [this]() {
+            qDebug() << "Transact: disconnected";
+            emit connectionStateChanged(VpnProtocol::Disconnected);
+        }, Qt::QueuedConnection);
+
+    connect(activity, &AndroidVPNActivity::eventStatisticUpdate, this,
+        [](const QString& parcelBody) {
+            qDebug() << "Transact:: update";
+
+            auto doc = QJsonDocument::fromJson(parcelBody.toUtf8());
+
+        // TODO: merge with "Android bandwidth" branch
+
+        //            emit statusUpdated(doc.object()["endpoint"].toString(),
+        //                               doc.object()["deviceIpv4"].toString(),
+        //                               doc.object()["tx_bytes"].toInt(),
+        //                               doc.object()["rx_bytes"].toInt());
+        }, Qt::QueuedConnection);
+
+    connect(activity, &AndroidVPNActivity::eventBackendLogs, this,
+        [this](const QString& parcelBody) {
+            qDebug() << "Transact: backend logs";
+
+            QString buffer = parcelBody.toUtf8();
+            if (m_logCallback) {
+                m_logCallback(buffer);
+            }
+        }, Qt::QueuedConnection);
+
+    connect(activity, &AndroidVPNActivity::eventActivationError, this,
+        [this](const QString& parcelBody) {
+            Q_UNUSED(parcelBody)
+            qDebug() << "Transact: error";
+            emit connectionStateChanged(VpnProtocol::Error);
+        }, Qt::QueuedConnection);
+
+    connect(activity, &AndroidVPNActivity::eventConfigImport, this,
+        [this](const QString& parcelBody) {
+            qDebug() << "Transact: config import";
+            auto doc = QJsonDocument::fromJson(parcelBody.toUtf8());
+
+            QString buffer = doc.object()["config"].toString();
+            qDebug() << "Transact: config string" << buffer;
+            importConfig(buffer);
+        }, Qt::QueuedConnection);
+
+    connect(activity, &AndroidVPNActivity::serviceDisconnected, this,
+        [this]() {
+            qDebug() << "Transact: service disconnected";
+            m_serviceConnected = false;
+        }, Qt::QueuedConnection);
 }
 
 AndroidController* AndroidController::instance() {
-    if (!s_instance) s_instance = new AndroidController();
+    if (!s_instance) {
+        s_instance = new AndroidController();
+    }
+
     return s_instance;
 }
 
@@ -73,71 +136,43 @@ bool AndroidController::initialize(StartPageLogic *startPageLogic)
     JNINativeMethod methods[]{{"startActivityForResult",
                                "(Landroid/content/Intent;)V",
                                reinterpret_cast<void*>(startActivityForResult)}};
-    QAndroidJniObject javaClass(PERMISSIONHELPER_CLASS);
-    QAndroidJniEnvironment env;
+    QJniObject javaClass(PERMISSIONHELPER_CLASS);
+    QJniEnvironment env;
     jclass objectClass = env->GetObjectClass(javaClass.object<jobject>());
-    env->RegisterNatives(objectClass, methods,
-                         sizeof(methods) / sizeof(methods[0]));
+    env->RegisterNatives(objectClass, methods, sizeof(methods) / sizeof(methods[0]));
     env->DeleteLocalRef(objectClass);
 
-    auto appContext = QtAndroid::androidActivity().callObjectMethod(
-        "getApplicationContext", "()Landroid/content/Context;");
+    AndroidVPNActivity::connectService();
 
-    QAndroidJniObject::callStaticMethod<void>(
-        "org/amnezia/vpn/VPNService", "startService",
-        "(Landroid/content/Context;)V", appContext.object());
-
-    // Start the VPN Service (if not yet) and Bind to it
-    const bool bindResult = QtAndroid::bindService(
-        QAndroidIntent(appContext.object(), "org.amnezia.vpn.VPNService"),
-        *this, QtAndroid::BindFlag::AutoCreate);
-    qDebug() << "Binding to the service..." << bindResult;
-
-    return bindResult;
+    return true;
 }
 
 ErrorCode AndroidController::start()
 {
-
-    //qDebug().noquote() << "AndroidController::start" << QJsonDocument(m_rawConfig).toJson();
     qDebug() << "Prompting for VPN permission";
-    auto appContext = QtAndroid::androidActivity().callObjectMethod(
+    QJniObject activity = AndroidUtils::getActivity();
+    auto appContext = activity.callObjectMethod(
                 "getApplicationContext", "()Landroid/content/Context;");
-    QAndroidJniObject::callStaticMethod<void>(
+    QJniObject::callStaticMethod<void>(
                 PERMISSIONHELPER_CLASS, "startService", "(Landroid/content/Context;)V",
                 appContext.object());
 
-    QAndroidParcel sendData;
-    sendData.writeData(QJsonDocument(m_vpnConfig).toJson());
-    bool activateResult = false;
-    while (!activateResult){
-        activateResult = m_serviceBinder.transact(ACTION_ACTIVATE, sendData, nullptr);
-    }
+    QJsonDocument doc(m_vpnConfig);
+    AndroidVPNActivity::sendToService(ServiceAction::ACTION_ACTIVATE, doc.toJson());
 
-    return activateResult ? NoError : UnknownError;
+    return NoError;
 }
 
 void AndroidController::stop() {
     qDebug() << "AndroidController::stop";
 
-//  if (reason != ReasonNone) {
-//    // Just show that we're disconnected
-//    // we're doing the actual disconnect once
-//    // the vpn-service has the new server ready in Action->Activate
-//    emit disconnected();
-//    qCritical() << "deactivation skipped for Switching";
-//    return;
-//  }
-
-    QAndroidParcel nullData;
-    m_serviceBinder.transact(ACTION_DEACTIVATE, nullData, nullptr);
+    AndroidVPNActivity::sendToService(ServiceAction::ACTION_DEACTIVATE, QString());
 }
 
 // Activates the tunnel that is currently set
 // in the VPN Service
 void AndroidController::resumeStart() {
-  QAndroidParcel nullData;
-  m_serviceBinder.transact(ACTION_RESUME_ACTIVATE, nullData, nullptr);
+    AndroidVPNActivity::sendToService(ServiceAction::ACTION_RESUME_ACTIVATE, QString());
 }
 
 /*
@@ -146,14 +181,13 @@ void AndroidController::resumeStart() {
 void AndroidController::setNotificationText(const QString& title,
                                             const QString& message,
                                             int timerSec) {
-  QJsonObject args;
-  args["title"] = title;
-  args["message"] = message;
-  args["sec"] = timerSec;
-  QJsonDocument doc(args);
-  QAndroidParcel data;
-  data.writeData(doc.toJson());
-  m_serviceBinder.transact(ACTION_SET_NOTIFICATION_TEXT, data, nullptr);
+    QJsonObject args;
+    args["title"] = title;
+    args["message"] = message;
+    args["sec"] = timerSec;
+    QJsonDocument doc(args);
+
+    AndroidVPNActivity::sendToService(ServiceAction::ACTION_SET_NOTIFICATION_TEXT, doc.toJson());
 }
 
 void AndroidController::shareConfig(const QString& configContent, const QString& suggestedName) {
@@ -161,9 +195,8 @@ void AndroidController::shareConfig(const QString& configContent, const QString&
     rootObject["data"] = configContent;
     rootObject["suggestedName"] = suggestedName;
     QJsonDocument doc(rootObject);
-    QAndroidParcel parcel;
-    parcel.writeData(doc.toJson());
-    m_serviceBinder.transact(ACTION_SHARE_CONFIG, parcel, nullptr);
+
+    AndroidVPNActivity::sendToService(ServiceAction::ACTION_SHARE_CONFIG, doc.toJson());
 }
 
 /*
@@ -172,64 +205,40 @@ void AndroidController::shareConfig(const QString& configContent, const QString&
  * e.g via always-on vpn
  */
 void AndroidController::setFallbackConnectedNotification() {
-  QJsonObject args;
-  args["title"] = tr("AmneziaVPN");
-  //% "Ready for you to connect"
-  //: Refers to the app - which is currently running the background and waiting
-  args["message"] = tr("VPN Connected");
-  QJsonDocument doc(args);
-  QAndroidParcel data;
-  data.writeData(doc.toJson());
-  m_serviceBinder.transact(ACTION_SET_NOTIFICATION_FALLBACK, data, nullptr);
+    QJsonObject args;
+    args["title"] = tr("AmneziaVPN");
+    //% "Ready for you to connect"
+    //: Refers to the app - which is currently running the background and waiting
+    args["message"] = tr("VPN Connected");
+    QJsonDocument doc(args);
+
+    AndroidVPNActivity::sendToService(ServiceAction::ACTION_SET_NOTIFICATION_FALLBACK, doc.toJson());
 }
 
 void AndroidController::checkStatus() {
-  qDebug() << "check status";
+    qDebug() << "check status";
 
-  QAndroidParcel nullParcel;
-  m_serviceBinder.transact(ACTION_REQUEST_STATISTIC, nullParcel, nullptr);
+    AndroidVPNActivity::sendToService(ServiceAction::ACTION_REQUEST_STATISTIC, QString());
 }
 
 void AndroidController::getBackendLogs(std::function<void(const QString&)>&& a_callback) {
-  qDebug() << "get logs";
+    qDebug() << "get logs";
 
-  m_logCallback = std::move(a_callback);
-  QAndroidParcel nullData, replyData;
-  m_serviceBinder.transact(ACTION_REQUEST_GET_LOG, nullData, &replyData);
+    m_logCallback = std::move(a_callback);
+
+    AndroidVPNActivity::sendToService(ServiceAction::ACTION_REQUEST_GET_LOG, QString());
 }
 
 void AndroidController::cleanupBackendLogs() {
-  qDebug() << "cleanup logs";
+    qDebug() << "cleanup logs";
 
-  QAndroidParcel nullParcel;
-  m_serviceBinder.transact(ACTION_REQUEST_CLEANUP_LOG, nullParcel, nullptr);
+    AndroidVPNActivity::sendToService(ServiceAction::ACTION_REQUEST_CLEANUP_LOG, QString());
 }
 
 void AndroidController::importConfig(const QString& data){
     m_startPageLogic->importConnectionFromCode(data);
 }
 
-void AndroidController::onServiceConnected(
-    const QString& name, const QAndroidBinder& serviceBinder) {
-  qDebug() << "Server " + name + " connected";
-
-  Q_UNUSED(name);
-
-  m_serviceBinder = serviceBinder;
-
-  // Send the Service our Binder to recive incoming Events
-  QAndroidParcel binderParcel;
-  binderParcel.writeBinder(m_binder);
-  m_serviceBinder.transact(ACTION_REGISTER_LISTENER, binderParcel, nullptr);
-}
-
-void AndroidController::onServiceDisconnected(const QString& name) {
-  qDebug() << "Server disconnected";
-  m_serviceConnected = false;
-  Q_UNUSED(name);
-  // TODO: Maybe restart? Or crash?
-}
-
 const QJsonObject &AndroidController::vpnConfig() const
 {
     return m_vpnConfig;
@@ -240,88 +249,6 @@ void AndroidController::setVpnConfig(const QJsonObject &newVpnConfig)
     m_vpnConfig = newVpnConfig;
 }
 
-
-/**
- * @brief AndroidController::VPNBinder::onTransact
- * @param code the Event-Type we get From the VPNService See
- * @param data - Might contain UTF-8 JSON in case the Event has a payload
- * @param reply - always null
- * @param flags - unused
- * @return Returns true is the code was a valid Event Code
- */
-bool AndroidController::VPNBinder::onTransact(int code,
-                                              const QAndroidParcel& data,
-                                              const QAndroidParcel& reply,
-                                              QAndroidBinder::CallType flags) {
-  Q_UNUSED(data);
-  Q_UNUSED(reply);
-  Q_UNUSED(flags);
-
-  QJsonDocument doc;
-  QString buffer;
-  switch (code) {
-    case EVENT_INIT:
-      qDebug() << "Transact: init";
-      doc = QJsonDocument::fromJson(data.readData());
-      emit m_controller->initialized(
-          true, doc.object()["connected"].toBool(),
-          QDateTime::fromMSecsSinceEpoch(
-              doc.object()["time"].toVariant().toLongLong()));
-      // Pass a localised version of the Fallback string for the Notification
-      m_controller->setFallbackConnectedNotification();
-
-      break;
-    case EVENT_CONNECTED:
-      qDebug() << "Transact: connected";
-      emit m_controller->connectionStateChanged(VpnProtocol::Connected);
-      break;
-    case EVENT_DISCONNECTED:
-      qDebug() << "Transact: disconnected";
-      emit m_controller->connectionStateChanged(VpnProtocol::Disconnected);
-      break;
-    case EVENT_STATISTIC_UPDATE:
-      qDebug() << "Transact:: update";
-
-      // Data is here a JSON String
-      doc = QJsonDocument::fromJson(data.readData());
-      // TODO update counters
-//      emit m_controller->statusUpdated(doc.object()["endpoint"].toString(),
-//                                       doc.object()["deviceIpv4"].toString(),
-//                                       doc.object()["totalTX"].toInt(),
-//                                       doc.object()["totalRX"].toInt());
-      break;
-    case EVENT_BACKEND_LOGS:
-      qDebug() << "Transact: backend logs";
-
-      buffer = readUTF8Parcel(data);
-      if (m_controller->m_logCallback) {
-        m_controller->m_logCallback(buffer);
-      }
-      break;
-    case EVENT_ACTIVATION_ERROR:
-      qDebug() << "Transact: error";
-      emit m_controller->connectionStateChanged(VpnProtocol::Error);
-      break;
-    case EVENT_CONFIG_IMPORT:
-      qDebug() << "Transact: config import";
-      doc = QJsonDocument::fromJson(data.readData());
-      buffer = doc.object()["config"].toString();
-      qDebug() << "Transact: config string" << buffer;
-      m_controller->importConfig(buffer);
-      break;
-    default:
-      qWarning() << "Transact: Invalid!";
-      break;
-  }
-
-  return true;
-}
-
-QString AndroidController::VPNBinder::readUTF8Parcel(QAndroidParcel data) {
-  // 106 is the Code for UTF-8
-  return QTextCodec::codecForMib(106)->toUnicode(data.readData());
-}
-
 const int ACTIVITY_RESULT_OK = 0xffffffff;
 /**
  * @brief Starts the Given intent in Context of the QTActivity
@@ -330,34 +257,34 @@ const int ACTIVITY_RESULT_OK = 0xffffffff;
  */
 void AndroidController::startActivityForResult(JNIEnv *env, jobject, jobject intent)
 {
-    qDebug() << "start activity";
+    qDebug() << "start vpnPermissionHelper";
     Q_UNUSED(env);
-    QtAndroid::startActivity(intent, 1337,
-                             [](int receiverRequestCode, int resultCode,
-                                const QAndroidJniObject& data) {
-                               // Currently this function just used in
-                               // VPNService.kt::checkPersmissions. So the result
-                               // we're getting is if the User gave us the
-                               // Vpn.bind permission. In case of NO we should
-                               // abort.
-                               Q_UNUSED(receiverRequestCode);
-                               Q_UNUSED(data);
 
-                               AndroidController* controller =
-                                   AndroidController::instance();
-                               if (!controller) {
-                                 return;
-                               }
+    QtAndroidPrivate::startActivity(intent, 1337,
+         [](int receiverRequestCode, int resultCode,
+            const QJniObject& data) {
+           // Currently this function just used in
+           // VPNService.kt::checkPersmissions. So the result
+           // we're getting is if the User gave us the
+           // Vpn.bind permission. In case of NO we should
+           // abort.
+           Q_UNUSED(receiverRequestCode);
+           Q_UNUSED(data);
 
-                               if (resultCode == ACTIVITY_RESULT_OK) {
-                                 qDebug() << "VPN PROMPT RESULT - Accepted";
-                                 controller->resumeStart();
-                                 return;
-                               }
-                               // If the request got rejected abort the current
-                               // connection.
-                               qWarning() << "VPN PROMPT RESULT - Rejected";
-                               emit controller->connectionStateChanged(VpnProtocol::Disconnected);
-                             });
+           AndroidController* controller = AndroidController::instance();
+           if (!controller) {
+                return;
+           }
+
+           if (resultCode == ACTIVITY_RESULT_OK) {
+                qDebug() << "VPN PROMPT RESULT - Accepted";
+                controller->resumeStart();
+                return;
+           }
+           // If the request got rejected abort the current
+           // connection.
+           qWarning() << "VPN PROMPT RESULT - Rejected";
+           emit controller->connectionStateChanged(VpnProtocol::Disconnected);
+         });
     return;
 }
diff --git a/client/platforms/android/android_controller.h b/client/platforms/android/android_controller.h
index cbe36a310..bd2c2f018 100644
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@@ -1,18 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #ifndef ANDROID_CONTROLLER_H
 #define ANDROID_CONTROLLER_H
 
-//#include <QAndroidBinder>
-//#include <QAndroidServiceConnection>
-#include <QtCore/private/qandroidextras_p.h>
+#include <QJniEnvironment>
+#include <QJniObject>
 
-#include "ui/uilogic.h"
 #include "ui/pages_logic/StartPageLogic.h"
 
 #include "protocols/vpnprotocol.h"
 using namespace amnezia;
 
 
-class AndroidController : public QObject, public QAndroidServiceConnection
+class AndroidController : public QObject
 {
     Q_OBJECT
 
@@ -37,8 +39,8 @@ public:
     void importConfig(const QString& data);
 
     // from QAndroidServiceConnection
-    void onServiceConnected(const QString& name, const QAndroidBinder& serviceBinder) override;
-    void onServiceDisconnected(const QString& name) override;
+//    void onServiceConnected(const QString& name, const QAndroidBinder& serviceBinder) override;
+//    void onServiceDisconnected(const QString& name) override;
 
     const QJsonObject &vpnConfig() const;
     void setVpnConfig(const QJsonObject &newVpnConfig);
@@ -60,6 +62,7 @@ protected:
 
 
 private:
+    bool m_init = false;
     //Protocol m_protocol;
     QJsonObject m_vpnConfig;
 
@@ -68,22 +71,22 @@ private:
     bool m_serviceConnected = false;
     std::function<void(const QString&)> m_logCallback;
 
-    QAndroidBinder m_serviceBinder;
-    class VPNBinder : public QAndroidBinder {
-     public:
-      VPNBinder(AndroidController* controller) : m_controller(controller) {}
+//    QAndroidBinder m_serviceBinder;
+//    class VPNBinder : public QAndroidBinder {
+//     public:
+//      VPNBinder(AndroidController* controller) : m_controller(controller) {}
 
-      bool onTransact(int code, const QAndroidParcel& data,
-                      const QAndroidParcel& reply,
-                      QAndroidBinder::CallType flags) override;
+//      bool onTransact(int code, const QAndroidParcel& data,
+//                      const QAndroidParcel& reply,
+//                      QAndroidBinder::CallType flags) override;
 
-      QString readUTF8Parcel(QAndroidParcel data);
+//      QString readUTF8Parcel(QAndroidParcel data);
 
-     private:
-      AndroidController* m_controller = nullptr;
-    };
+//     private:
+//      AndroidController* m_controller = nullptr;
+//    };
 
-    VPNBinder m_binder;
+//    VPNBinder m_binder;
 
     static void startActivityForResult(JNIEnv* env, jobject /*thiz*/, jobject intent);
 };
diff --git a/client/protocols/android_vpnprotocol.cpp b/client/protocols/android_vpnprotocol.cpp
index cf9e443aa..067296f01 100644
--- a/client/protocols/android_vpnprotocol.cpp
+++ b/client/protocols/android_vpnprotocol.cpp
@@ -1,9 +1,3 @@
-//#include <QAndroidBinder>
-//#include <QAndroidIntent>
-//#include <QAndroidJniEnvironment>
-//#include <QAndroidJniObject>
-//#include <QAndroidParcel>
-//#include <QAndroidServiceConnection>
 #include <QDebug>
 #include <QHostAddress>
 #include <QJsonArray>
@@ -12,12 +6,8 @@
 #include <QRandomGenerator>
 #include <QTextCodec>
 #include <QTimer>
-//#include <QtAndroid>
-#include <QtCore/private/qandroidextras_p.h>
-
 
 #include "android_vpnprotocol.h"
-#include "core/errorstrings.h"
 
 #include "platforms/android/android_controller.h"
 
diff --git a/client/protocols/android_vpnprotocol.h b/client/protocols/android_vpnprotocol.h
index cdcff2c6b..6dbe2fddb 100644
--- a/client/protocols/android_vpnprotocol.h
+++ b/client/protocols/android_vpnprotocol.h
@@ -1,16 +1,11 @@
 #ifndef ANDROID_VPNPROTOCOL_H
 #define ANDROID_VPNPROTOCOL_H
 
-#include <QAndroidBinder>
-#include <QAndroidServiceConnection>
-
 #include "vpnprotocol.h"
 #include "protocols/protocols_defs.h"
 
 using namespace amnezia;
 
-
-
 class AndroidVpnProtocol : public VpnProtocol
 {
     Q_OBJECT
@@ -32,7 +27,6 @@ protected:
 
 private:
     Proto m_protocol;
-
 };
 
 #endif // ANDROID_VPNPROTOCOL_H
diff --git a/client/ui/pages_logic/ServerSettingsLogic.cpp b/client/ui/pages_logic/ServerSettingsLogic.cpp
index 3b123174a..14927f9f3 100644
--- a/client/ui/pages_logic/ServerSettingsLogic.cpp
+++ b/client/ui/pages_logic/ServerSettingsLogic.cpp
@@ -11,9 +11,7 @@
 #include <QTimer>
 
 #if defined(Q_OS_ANDROID)
-#include <QAndroidJniObject>
-#include <QAndroidJniEnvironment>
-#include <QtAndroid>
+#include "androidutils.h"
 #endif
 
 ServerSettingsLogic::ServerSettingsLogic(UiLogic *logic, QObject *parent):
@@ -24,9 +22,7 @@ ServerSettingsLogic::ServerSettingsLogic(UiLogic *logic, QObject *parent):
     m_pushButtonShareFullVisible{true},
     m_pushButtonClearText{tr("Clear server from Amnezia software")},
     m_pushButtonClearClientCacheText{tr("Clear client cached profile")}
-{
-
-}
+{ }
 
 void ServerSettingsLogic::onUpdatePage()
 {
@@ -134,7 +130,7 @@ void ServerSettingsLogic::onLineEditDescriptionEditingFinished()
 
 #if defined(Q_OS_ANDROID)
 /* Auth result handler for Android */
-void authResultReceiver::handleActivityResult(int receiverRequestCode, int resultCode, const QAndroidJniObject &data)
+void authResultReceiver::handleActivityResult(int receiverRequestCode, int resultCode, const QJniObject &data)
 {
     qDebug() << "receiverRequestCode" << receiverRequestCode << "resultCode" << resultCode;
 
@@ -149,16 +145,17 @@ void ServerSettingsLogic::onPushButtonShareFullClicked()
 {
 #if defined(Q_OS_ANDROID)
 /* We use builtin keyguard for ssh key export protection on Android */
-    auto appContext = QtAndroid::androidActivity().callObjectMethod(
+    QJniObject activity = AndroidUtils::getActivity();
+    auto appContext = activity.callObjectMethod(
         "getApplicationContext", "()Landroid/content/Context;");
     if (appContext.isValid()) {
         QAndroidActivityResultReceiver *receiver = new authResultReceiver(uiLogic(), uiLogic()->selectedServerIndex);
-        auto intent = QAndroidJniObject::callStaticObjectMethod(
+        auto intent = QJniObject::callStaticObjectMethod(
                "org/amnezia/vpn/AuthHelper", "getAuthIntent",
                "(Landroid/content/Context;)Landroid/content/Intent;", appContext.object());
         if (intent.isValid()) {
             if (intent.object<jobject>() != nullptr) {
-                    QtAndroid::startActivity(intent.object<jobject>(), 1, receiver);
+                    QtAndroidPrivate::startActivity(intent.object<jobject>(), 1, receiver);
                 }
             } else {
             uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->selectedServerIndex, DockerContainer::None);
diff --git a/client/ui/pages_logic/ServerSettingsLogic.h b/client/ui/pages_logic/ServerSettingsLogic.h
index e2d574224..d561ec48a 100644
--- a/client/ui/pages_logic/ServerSettingsLogic.h
+++ b/client/ui/pages_logic/ServerSettingsLogic.h
@@ -4,7 +4,8 @@
 #include "PageLogicBase.h"
 
 #if defined(Q_OS_ANDROID)
-#include <QAndroidActivityResultReceiver>
+#include <QJniObject>
+#include <private/qandroidextras_p.h>
 #endif
 
 class UiLogic;
@@ -52,7 +53,7 @@ public:
     ~authResultReceiver() {}
 
 public:
-    void handleActivityResult(int receiverRequestCode, int resultCode, const QAndroidJniObject &data) override;
+    void handleActivityResult(int receiverRequestCode, int resultCode, const QJniObject &data) override;
 
 private:
     int  m_serverIndex;
diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp
index 8c24b0d8b..03ace70a0 100644
--- a/client/ui/pages_logic/StartPageLogic.cpp
+++ b/client/ui/pages_logic/StartPageLogic.cpp
@@ -11,8 +11,8 @@
 #include <QStandardPaths>
 
 #ifdef Q_OS_ANDROID
-#include <QtAndroid>
-#include "platforms/android/android_controller.h"
+#include <QJniObject>
+#include "androidutils.h"
 #endif
 
 StartPageLogic::StartPageLogic(UiLogic *logic, QObject *parent):
@@ -26,8 +26,9 @@ StartPageLogic::StartPageLogic(UiLogic *logic, QObject *parent):
 {
 #ifdef Q_OS_ANDROID
     // Set security screen for Android app
-    QtAndroid::runOnAndroidThread([]() {
-        QAndroidJniObject window = QtAndroid::androidActivity().callObjectMethod("getWindow", "()Landroid/view/Window;");
+    AndroidUtils::runOnAndroidThreadSync([]() {
+        QJniObject activity = AndroidUtils::getActivity();
+        QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
         if (window.isValid()){
             const int FLAG_SECURE = 8192;
             window.callMethod<void>("addFlags", "(I)V", FLAG_SECURE);

From 82165eaf37ce4c573a13e710f8ad09adc0b6989e Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Mon, 26 Dec 2022 14:00:45 +0300
Subject: [PATCH 04/49] 1) Fixed theme 2) Fixed VPN connection

---
 client/android/AndroidManifest.xml | 85 +++++++++++++++++++++++++-----
 client/client.pro                  | 13 +++--
 2 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/client/android/AndroidManifest.xml b/client/android/AndroidManifest.xml
index 18ffbd9b3..09a8775b6 100644
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
-<manifest package="org.amnezia.vpn" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
+<manifest
+    package="org.amnezia.vpn"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionName="-- %%INSERT_VERSION_NAME%% --"
+    android:versionCode="-- %%INSERT_VERSION_CODE%% --"
+    android:installLocation="auto">
 
    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -16,14 +21,36 @@
          Remove the comment if you do not require these default features. -->
     <!-- %%INSERT_FEATURES -->
 
-    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+    <supports-screens
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:anyDensity="true"
+        android:smallScreens="true"/>
 
-    <application android:name=".qt.AmneziaApp" android:hardwareAccelerated="true" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true" android:icon="@drawable/icon">
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name=".qt.VPNActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleInstance" android:taskAffinity="" android:theme="@style/splashScreenTheme">
+    <application
+        android:name=".qt.AmneziaApp"
+        android:hardwareAccelerated="true"
+        android:label="-- %%INSERT_APP_NAME%% --"
+        android:extractNativeLibs="true"
+        android:requestLegacyExternalStorage="true"
+        android:allowNativeHeapPointerTagging="false"
+        android:icon="@drawable/icon">
+        
+        <activity
+            android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
+            android:name=".qt.VPNActivity"
+            android:label="-- %%INSERT_APP_NAME%% --"
+            android:screenOrientation="unspecified"
+            android:launchMode="singleInstance"
+            android:exported="true">
+    
+<!--            android:theme="@style/splashScreenTheme"-->
+            
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            
             <intent-filter android:label="AmneziaVPN">
                 <action android:name="android.intent.action.SEND"/>
                 <action android:name="android.intent.action.VIEW"/>
@@ -38,6 +65,7 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\.vpn"/>
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.vpn"/>
             </intent-filter>
+            
             <intent-filter android:label="AmneziaVPN">
                 <action android:name="android.intent.action.SEND"/>
                 <action android:name="android.intent.action.VIEW"/>
@@ -52,6 +80,7 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\.cfg"/>
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.cfg"/>
             </intent-filter>
+            
             <intent-filter android:label="AmneziaVPN">
                 <action android:name="android.intent.action.SEND"/>
                 <action android:name="android.intent.action.VIEW"/>
@@ -67,22 +96,50 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.conf"/>
             </intent-filter>
 
-            <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
-            <meta-data android:name="android.app.extract_android_style" android:value="minimal" />
-            <meta-data android:name="android.app.background_running" android:value="false"/>
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
+            
+            <meta-data
+                android:name="android.app.extract_android_style"
+                android:value="minimal" />
+            
+            <meta-data
+                android:name="android.app.background_running"
+                android:value="false"/>
+            
+            <meta-data
+                android:name="android.app.arguments"
+                android:value="-- %%INSERT_APP_ARGUMENTS%% --" />
 
         </activity>
 
-        <service android:name=".VPNService" android:process=":QtOnlyProcess">
-            <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
+        <service
+            android:name=".VPNService"
+            android:process=":QtOnlyProcess"
+            android:permission="android.permission.BIND_VPN_SERVICE"
+            android:exported="true">
+                <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
+    
+                <intent-filter>
+                    <action android:name="android.net.VpnService"/>
+                </intent-filter>
         </service>
-        <service android:name=".qt.VPNPermissionHelper">
-            <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
+        
+        <service
+            android:name=".qt.VPNPermissionHelper"
+            android:permission="android.permission.BIND_VPN_SERVICE"
+            android:exported="true">
+                <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
         </service>
+        
         <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
-        <provider android:name="androidx.core.content.FileProvider" android:authorities="org.amnezia.vpn.fileprovider" android:exported="false" android:grantUriPermissions="true">
-
-            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/fileprovider"/>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="org.amnezia.vpn.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+                <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/fileprovider"/>
         </provider>
     </application>
 
diff --git a/client/client.pro b/client/client.pro
index a5d1f4f5c..c9f204ed2 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -46,8 +46,6 @@ HEADERS  += \
     debug.h \
     defines.h \
     managementserver.h \
-    platforms/android/androidutils.h \
-    platforms/android/androidvpnactivity.h \
     platforms/ios/MobileUtils.h \
     platforms/linux/leakdetector.h \
     protocols/protocols_defs.h \
@@ -110,8 +108,6 @@ SOURCES  += \
     debug.cpp \
     main.cpp \
     managementserver.cpp \
-    platforms/android/androidutils.cpp \
-    platforms/android/androidvpnactivity.cpp \
     platforms/ios/MobileUtils.cpp \
     platforms/linux/leakdetector.cpp \
     protocols/protocols_defs.cpp \
@@ -264,13 +260,16 @@ android {
    HEADERS += \
       platforms/android/android_controller.h \
       platforms/android/android_notificationhandler.h \
-      protocols/android_vpnprotocol.h
+      protocols/android_vpnprotocol.h \
+      platforms/android/androidutils.h \
+      platforms/android/androidvpnactivity.h
 
    SOURCES += \
       platforms/android/android_controller.cpp \
       platforms/android/android_notificationhandler.cpp \
-      protocols/android_vpnprotocol.cpp
-
+      protocols/android_vpnprotocol.cpp \
+      platforms/android/androidutils.cpp \
+      platforms/android/androidvpnactivity.cpp
 
    DISTFILES += \
       android/AndroidManifest.xml \

From ad7fc937a9619209ad8ece6cceef6facccbdb028 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 27 Dec 2022 11:10:01 +0300
Subject: [PATCH 05/49] Added missing files

---
 client/CMakeLists.txt                         |  16 +-
 client/platforms/android/androidutils.cpp     | 174 ++++++++++++++++++
 client/platforms/android/androidutils.h       |  49 +++++
 .../platforms/android/androidvpnactivity.cpp  | 137 ++++++++++++++
 client/platforms/android/androidvpnactivity.h |  93 ++++++++++
 5 files changed, 465 insertions(+), 4 deletions(-)
 create mode 100644 client/platforms/android/androidutils.cpp
 create mode 100644 client/platforms/android/androidutils.h
 create mode 100644 client/platforms/android/androidvpnactivity.cpp
 create mode 100644 client/platforms/android/androidvpnactivity.h

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 8aeddc32a..3c8c5949b 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -277,12 +277,16 @@ if(ANDROID)
     set(HEADERS ${HEADERS}
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/android_controller.h
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/android_notificationhandler.h
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/android/androidutils.h
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/android/androidvpnactivity.h
         ${CMAKE_CURRENT_LIST_DIR}/protocols/android_vpnprotocol.h
     )
 
     set(SOURCES ${SOURCES}
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/android_controller.cp
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/android_notificationhandler.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/android/androidutils.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/android/androidvpnactivity.cpp
         ${CMAKE_CURRENT_LIST_DIR}/protocols/android_vpnprotocol.cpp
     )
 endif()
@@ -465,6 +469,8 @@ set_source_files_properties(
 endif()
 
 if(ANDROID)
+    set(QT_ANDROID_BUILD_ALL_ABIS ON)
+
     add_custom_command(
         TARGET ${PROJECT} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy
@@ -489,18 +495,19 @@ if(ANDROID)
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/PackageManagerHelper.java
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/VPNActivity.kt
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/VPNApplication.java
+            ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/VPNClientBinder.kt
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/VPNPermissionHelper.kt
             ${CMAKE_CURRENT_BINARY_DIR}
     )
 
-    set_property(TARGET ${PROJECT} 
+    set_property(TARGET ${PROJECT} PROPERTY
         QT_ANDROID_PACKAGE_SOURCE_DIR 
         ${CMAKE_CURRENT_LIST_DIR}/android
     )
 
-    foreach(abi IN ANDROID_ABIS)
+    foreach(abi IN LISTS ${QT_ANDROID_ABIS})
         if(ANDROID_TARGET_ARCH EQUAL ${abi})
-            set(LIBS ${LIBS} 
+            set(LIBS ${LIBS}
                 ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/lib/android/${abi}/libcrypto.a
                 ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/lib/android/${abi}/libssl.a
             )
@@ -510,7 +517,7 @@ if(ANDROID)
             ${CMAKE_CURRENT_LIST_DIR}/android/lib/wireguard/${abi}/libwg.so
             ${CMAKE_CURRENT_LIST_DIR}/android/lib/wireguard/${abi}/libwg-go.so
             ${CMAKE_CURRENT_LIST_DIR}/android/lib/wireguard/${abi}/libwg-quick.so
-    
+
             ${CMAKE_CURRENT_LIST_DIR}/android/lib/openvpn/${abi}/libjbcrypto.so
             ${CMAKE_CURRENT_LIST_DIR}/android/lib/openvpn/${abi}/libopenvpn.so
             ${CMAKE_CURRENT_LIST_DIR}/android/lib/openvpn/${abi}/libopvpnutil.so
@@ -518,6 +525,7 @@ if(ANDROID)
             ${CMAKE_CURRENT_LIST_DIR}/android/lib/openvpn/${abi}/libovpnexec.so
         )
     endforeach()
+
 endif()
 
 target_link_libraries(${PROJECT} PRIVATE ${LIBS})
diff --git a/client/platforms/android/androidutils.cpp b/client/platforms/android/androidutils.cpp
new file mode 100644
index 000000000..5e9f094cf
--- /dev/null
+++ b/client/platforms/android/androidutils.cpp
@@ -0,0 +1,174 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "androidutils.h"
+
+#include <QApplication>
+#include <QJniEnvironment>
+#include <QJniObject>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QNetworkCookieJar>
+#include <QUrlQuery>
+#include <QTimer>
+
+#include "jni.h"
+
+namespace {
+    AndroidUtils* s_instance = nullptr;
+}  // namespace
+
+// static
+QString AndroidUtils::GetDeviceName() {
+    QJniEnvironment env;
+    jclass BUILD = env->FindClass("android/os/Build");
+    jfieldID model = env->GetStaticFieldID(BUILD, "MODEL", "Ljava/lang/String;");
+    jstring value = (jstring)env->GetStaticObjectField(BUILD, model);
+
+    if (!value) {
+        return QString("Android Device");
+    }
+
+    const char* buffer = env->GetStringUTFChars(value, nullptr);
+    if (!buffer) {
+        return QString("Android Device");
+    }
+
+    QString res(buffer);
+    env->ReleaseStringUTFChars(value, buffer);
+
+    return res;
+};
+
+// static
+AndroidUtils* AndroidUtils::instance() {
+    if (!s_instance) {
+        Q_ASSERT(qApp);
+        s_instance = new AndroidUtils(qApp);
+    }
+
+    return s_instance;
+}
+
+AndroidUtils::AndroidUtils(QObject* parent) : QObject(parent) {
+    Q_ASSERT(!s_instance);
+    s_instance = this;
+}
+
+AndroidUtils::~AndroidUtils() {
+    Q_ASSERT(s_instance == this);
+    s_instance = nullptr;
+}
+
+// static
+void AndroidUtils::dispatchToMainThread(std::function<void()> callback) {
+    QTimer* timer = new QTimer();
+    timer->moveToThread(qApp->thread());
+    timer->setSingleShot(true);
+    QObject::connect(timer, &QTimer::timeout, [=]() {
+        callback();
+        timer->deleteLater();
+    });
+    QMetaObject::invokeMethod(timer, "start", Qt::QueuedConnection);
+}
+
+// static
+QByteArray AndroidUtils::getQByteArrayFromJString(JNIEnv* env, jstring data) {
+    const char* buffer = env->GetStringUTFChars(data, nullptr);
+    if (!buffer) {
+        qDebug() << "getQByteArrayFromJString - failed to parse data.";
+        return QByteArray();
+    }
+
+    QByteArray out(buffer);
+    env->ReleaseStringUTFChars(data, buffer);
+    return out;
+}
+
+// static
+QString AndroidUtils::getQStringFromJString(JNIEnv* env, jstring data) {
+    const char* buffer = env->GetStringUTFChars(data, nullptr);
+    if (!buffer) {
+        qDebug() << "getQStringFromJString - failed to parse data.";
+        return QString();
+    }
+
+    QString out(buffer);
+    env->ReleaseStringUTFChars(data, buffer);
+    return out;
+}
+
+// static
+QJsonObject AndroidUtils::getQJsonObjectFromJString(JNIEnv* env, jstring data) {
+    QByteArray raw(getQByteArrayFromJString(env, data));
+    QJsonParseError jsonError;
+    QJsonDocument json = QJsonDocument::fromJson(raw, &jsonError);
+    if (QJsonParseError::NoError != jsonError.error) {
+        qDebug() << "getQJsonObjectFromJstring - error parsing json. Code: "
+                       << jsonError.error << "Offset: " << jsonError.offset
+                       << "Message: " << jsonError.errorString()
+                       << "Data: " << raw;
+        return QJsonObject();
+    }
+
+    if (!json.isObject()) {
+        qDebug() << "getQJsonObjectFromJString - object expected.";
+        return QJsonObject();
+    }
+
+    return json.object();
+}
+
+QJniObject AndroidUtils::getActivity() {
+    return QNativeInterface::QAndroidApplication::context();
+}
+
+int AndroidUtils::GetSDKVersion() {
+    QJniEnvironment env;
+    jclass versionClass = env->FindClass("android/os/Build$VERSION");
+    jfieldID sdkIntFieldID = env->GetStaticFieldID(versionClass, "SDK_INT", "I");
+    int sdk = env->GetStaticIntField(versionClass, sdkIntFieldID);
+
+    return sdk;
+}
+
+QString AndroidUtils::GetManufacturer() {
+    QJniEnvironment env;
+    jclass buildClass = env->FindClass("android/os/Build");
+    jfieldID manuFacturerField =
+        env->GetStaticFieldID(buildClass, "MANUFACTURER", "Ljava/lang/String;");
+    jstring value =
+        (jstring)env->GetStaticObjectField(buildClass, manuFacturerField);
+
+    const char* buffer = env->GetStringUTFChars(value, nullptr);
+
+    if (!buffer) {
+        qDebug() << "Failed to fetch MANUFACTURER";
+        return QByteArray();
+    }
+
+    QString res(buffer);
+    qDebug() << "MANUFACTURER: " << res;
+    env->ReleaseStringUTFChars(value, buffer);
+    return res;
+}
+
+void AndroidUtils::runOnAndroidThreadSync(const std::function<void()> runnable) {
+    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable)
+        .waitForFinished();
+}
+
+void AndroidUtils::runOnAndroidThreadAsync(const std::function<void()> runnable) {
+    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable);
+}
+
+// Static
+// Creates a copy of the passed QByteArray in the JVM and passes back a ref
+jbyteArray AndroidUtils::tojByteArray(const QByteArray& data) {
+    QJniEnvironment env;
+    jbyteArray out = env->NewByteArray(data.size());
+    env->SetByteArrayRegion(out, 0, data.size(),
+                            reinterpret_cast<const jbyte*>(data.constData()));
+    return out;
+}
diff --git a/client/platforms/android/androidutils.h b/client/platforms/android/androidutils.h
new file mode 100644
index 000000000..8559400c8
--- /dev/null
+++ b/client/platforms/android/androidutils.h
@@ -0,0 +1,49 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef ANDROIDUTILS_H
+#define ANDROIDUTILS_H
+
+#include <jni.h>
+
+#include <QJniEnvironment>
+#include <QJniObject>
+#include <QObject>
+#include <QString>
+#include <QUrl>
+
+class AndroidUtils final : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY_MOVE(AndroidUtils)
+
+public:
+    static QString GetDeviceName();
+
+    static int GetSDKVersion();
+    static QString GetManufacturer();
+
+    static AndroidUtils* instance();
+
+    static void dispatchToMainThread(std::function<void()> callback);
+
+    static QByteArray getQByteArrayFromJString(JNIEnv* env, jstring data);
+
+    static jbyteArray tojByteArray(const QByteArray& data);
+
+    static QString getQStringFromJString(JNIEnv* env, jstring data);
+
+    static QJsonObject getQJsonObjectFromJString(JNIEnv* env, jstring data);
+
+    static QJniObject getActivity();
+
+    static void runOnAndroidThreadSync(const std::function<void()> runnable);
+    static void runOnAndroidThreadAsync(const std::function<void()> runnable);
+
+private:
+    AndroidUtils(QObject* parent);
+    ~AndroidUtils();
+};
+
+#endif // ANDROIDUTILS_H
diff --git a/client/platforms/android/androidvpnactivity.cpp b/client/platforms/android/androidvpnactivity.cpp
new file mode 100644
index 000000000..5139352fa
--- /dev/null
+++ b/client/platforms/android/androidvpnactivity.cpp
@@ -0,0 +1,137 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "androidvpnactivity.h"
+
+#include <QApplication>
+#include <QJniEnvironment>
+#include <QJniObject>
+#include <QJsonDocument>
+#include <QJsonObject>
+
+#include "androidutils.h"
+#include "jni.h"
+
+namespace {
+    AndroidVPNActivity* s_instance = nullptr;
+    constexpr auto CLASSNAME = "org.amnezia.vpn.qt.VPNActivity";
+}
+
+AndroidVPNActivity::AndroidVPNActivity() {
+    AndroidUtils::runOnAndroidThreadAsync([]() {
+        JNINativeMethod methods[]{
+            {"handleBackButton", "()Z", reinterpret_cast<bool*>(handleBackButton)},
+            {"onServiceMessage", "(ILjava/lang/String;)V",
+             reinterpret_cast<void*>(onServiceMessage)},
+            {"qtOnServiceConnected", "()V",
+             reinterpret_cast<void*>(onServiceConnected)},
+            {"qtOnServiceDisconnected", "()V",
+             reinterpret_cast<void*>(onServiceDisconnected)},
+        };
+
+        QJniObject javaClass(CLASSNAME);
+        QJniEnvironment env;
+        jclass objectClass = env->GetObjectClass(javaClass.object<jobject>());
+        env->RegisterNatives(objectClass, methods, sizeof(methods) / sizeof(methods[0]));
+        env->DeleteLocalRef(objectClass);
+    });
+}
+
+void AndroidVPNActivity::maybeInit() {
+    if (s_instance == nullptr) {
+        s_instance = new AndroidVPNActivity();
+    }
+}
+
+// static
+bool AndroidVPNActivity::handleBackButton(JNIEnv* env, jobject thiz) {
+    Q_UNUSED(env);
+    Q_UNUSED(thiz);
+    //  return Navigator::instance()->eventHandled();
+}
+
+void AndroidVPNActivity::connectService() {
+    QJniObject::callStaticMethod<void>(CLASSNAME, "connectService", "()V");
+}
+
+// static
+AndroidVPNActivity* AndroidVPNActivity::instance() {
+    if (s_instance == nullptr) {
+        AndroidVPNActivity::maybeInit();
+    }
+
+    return s_instance;
+}
+
+// static
+void AndroidVPNActivity::sendToService(ServiceAction type, const QString& data) {
+    int messageType = (int)type;
+
+    QJniEnvironment env;
+    QJniObject::callStaticMethod<void>(
+        CLASSNAME, "sendToService", "(ILjava/lang/String;)V",
+        static_cast<int>(messageType),
+        QJniObject::fromString(data).object<jstring>());
+}
+
+// static
+void AndroidVPNActivity::onServiceMessage(JNIEnv* env, jobject thiz,
+                                          jint messageType, jstring body) {
+    Q_UNUSED(thiz);
+    const char* buffer = env->GetStringUTFChars(body, nullptr);
+    if (!buffer) {
+        return;
+    }
+
+    QString parcelBody(buffer);
+    env->ReleaseStringUTFChars(body, buffer);
+    AndroidUtils::dispatchToMainThread([messageType, parcelBody] {
+        AndroidVPNActivity::instance()->handleServiceMessage(messageType,
+                                                            parcelBody);
+    });
+}
+
+void AndroidVPNActivity::handleServiceMessage(int code, const QString& data) {
+    auto mode = (ServiceEvents)code;
+
+    switch (mode) {
+    case ServiceEvents::EVENT_INIT:
+        emit eventInitialized(data);
+        break;
+    case ServiceEvents::EVENT_CONNECTED:
+        emit eventConnected(data);
+        break;
+    case ServiceEvents::EVENT_DISCONNECTED:
+        emit eventDisconnected(data);
+        break;
+    case ServiceEvents::EVENT_STATISTIC_UPDATE:
+        emit eventStatisticUpdate(data);
+        break;
+    case ServiceEvents::EVENT_BACKEND_LOGS:
+        emit eventBackendLogs(data);
+        break;
+    case ServiceEvents::EVENT_ACTIVATION_ERROR:
+        emit eventActivationError(data);
+        break;
+    case ServiceEvents::EVENT_CONFIG_IMPORT:
+        emit eventConfigImport(data);
+        break;
+    default:
+        Q_ASSERT(false);
+    }
+}
+
+void AndroidVPNActivity::onServiceConnected(JNIEnv* env, jobject thiz) {
+    Q_UNUSED(env);
+    Q_UNUSED(thiz);
+
+    emit AndroidVPNActivity::instance()->serviceConnected();
+}
+
+void AndroidVPNActivity::onServiceDisconnected(JNIEnv* env, jobject thiz) {
+    Q_UNUSED(env);
+    Q_UNUSED(thiz);
+
+    emit AndroidVPNActivity::instance()->serviceDisconnected();
+}
diff --git a/client/platforms/android/androidvpnactivity.h b/client/platforms/android/androidvpnactivity.h
new file mode 100644
index 000000000..49d1aae5e
--- /dev/null
+++ b/client/platforms/android/androidvpnactivity.h
@@ -0,0 +1,93 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef ANDROIDVPNACTIVITY_H
+#define ANDROIDVPNACTIVITY_H
+
+#include <QObject>
+
+#include "jni.h"
+
+// Binder Codes for VPNServiceBinder
+// See also - VPNServiceBinder.kt
+// Actions that are Requestable
+enum ServiceAction {
+    // Activate the vpn. Body requires a json wg-conf
+    ACTION_ACTIVATE = 1,
+    // Deactivate the vpn. Body is empty
+    ACTION_DEACTIVATE = 2,
+    // Register an IBinder to recieve events body is an Ibinder
+    ACTION_REGISTERLISTENER = 3,
+    // Requests an EVENT_STATISTIC_UPDATE to be send
+    ACTION_REQUEST_STATISTIC = 4,
+    ACTION_REQUEST_GET_LOG = 5,
+    // Requests to clean up the internal log
+    ACTION_REQUEST_CLEANUP_LOG = 6,
+    // Retry activation using the last config
+    // Used when the activation is aborted for VPN-Permission prompt
+    ACTION_RESUME_ACTIVATE = 7,
+    // Sets the current notification text.
+    // Does nothing if there is no notification
+    ACTION_SET_NOTIFICATION_TEXT = 8,
+    // Sets the fallback text if the OS triggered the VPN-Service
+    // to show a notification
+    ACTION_SET_NOTIFICATION_FALLBACK = 9,
+    // Share used config
+    ACTION_SHARE_CONFIG = 10,
+};
+typedef enum ServiceAction ServiceAction;
+
+// Event Types that will be Dispatched after registration
+enum ServiceEvents {
+    // The Service has Accecpted our Binder
+    // Responds with the current status of the vpn.
+    EVENT_INIT = 0,
+    // WG-Go has enabled the adapter (empty response)
+    EVENT_CONNECTED = 1,
+    // WG-Go has disabled the adapter (empty response)
+    EVENT_DISCONNECTED = 2,
+    // Contains the Current transfered bytes to endpoint x.
+    EVENT_STATISTIC_UPDATE = 3,
+    EVENT_BACKEND_LOGS = 4,
+    // An Error happened during activation
+    // Contains the error message
+    EVENT_ACTIVATION_ERROR = 5,
+    EVENT_NEED_PERMISSION = 6,
+    // Import of existing config
+    EVENT_CONFIG_IMPORT = 7,
+};
+typedef enum ServiceEvents ServiceEvents;
+
+class AndroidVPNActivity : public QObject
+{
+    Q_OBJECT
+
+public:
+    static void maybeInit();
+    static AndroidVPNActivity* instance();
+    static bool handleBackButton(JNIEnv* env, jobject thiz);
+    static void sendToService(ServiceAction type, const QString& data);
+    static void connectService();
+
+signals:
+    void serviceConnected();
+    void serviceDisconnected();
+    void eventInitialized(const QString& data);
+    void eventConnected(const QString& data);
+    void eventDisconnected(const QString& data);
+    void eventStatisticUpdate(const QString& data);
+    void eventBackendLogs(const QString& data);
+    void eventActivationError(const QString& data);
+    void eventConfigImport(const QString& data);
+
+private:
+    AndroidVPNActivity();
+
+    static void onServiceMessage(JNIEnv* env, jobject thiz, jint messageType, jstring body);
+    static void onServiceConnected(JNIEnv* env, jobject thiz);
+    static void onServiceDisconnected(JNIEnv* env, jobject thiz);
+    void handleServiceMessage(int code, const QString& data);
+};
+
+#endif // ANDROIDVPNACTIVITY_H

From ad4b3dfad11ffb9ae5e2196389409e514e1f6251 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 27 Dec 2022 15:37:58 +0300
Subject: [PATCH 06/49] [WIP] cmake build for android

---
 CMakeLists.txt                                |  4 ++++
 client/3rd/QtSsh/src/botan/botan.cmake        | 12 ++++++++----
 client/CMakeLists.txt                         |  6 ++----
 client/ui/pages_logic/QrDecoderLogic.cpp      |  4 ----
 client/ui/pages_logic/ServerSettingsLogic.cpp |  3 +--
 client/ui/pages_logic/StartPageLogic.cpp      |  2 +-
 client/vpnconnection.cpp                      |  2 +-
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6236396e2..d8f2b7ed5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 set(PROJECT AmneziaVPN)
 project(${PROJECT})
 
+#if(ANDROID)
+#    set(QT_ANDROID_BUILD_ALL_ABIS ON)
+#endif()
+
 add_subdirectory(client)
 
 if(NOT IOS AND NOT ANDROID)
diff --git a/client/3rd/QtSsh/src/botan/botan.cmake b/client/3rd/QtSsh/src/botan/botan.cmake
index d363fe714..0dce1f5eb 100644
--- a/client/3rd/QtSsh/src/botan/botan.cmake
+++ b/client/3rd/QtSsh/src/botan/botan.cmake
@@ -38,11 +38,15 @@ if(ANDROID)
     # We need to include qtprivate api's
     # As QAndroidBinder is not yet implemented with a public api
     set(LIBS ${LIBS} Qt6::CorePrivate)
-    set(ANDROID_ABIS ANDROID_TARGET_ARCH)
 
-    link_directories(${CMAKE_CURRENT_LIST_DIR}/android/${ANDROID_TARGET_ARCH})
-    set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/android/${ANDROID_TARGET_ARCH}/botan_all.h)
-    set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/android/${ANDROID_TARGET_ARCH}/botan_all.cpp)
+    message("botan target arch ${CMAKE_ANDROID_ARCH_ABI}")
+    set(abi ${CMAKE_ANDROID_ARCH_ABI})
+
+    include_directories(${CMAKE_CURRENT_LIST_DIR}/android/${abi})
+    link_directories(${CMAKE_CURRENT_LIST_DIR}/android/${abi})
+    set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/android/${abi}/botan_all.h)
+    set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/android/${abi}/botan_all.cpp)
+
 endif()
 
 if(IOS)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 3c8c5949b..e78e03c9a 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -268,7 +268,7 @@ if(ANDROID)
     # We need to include qtprivate api's
     # As QAndroidBinder is not yet implemented with a public api
     set(LIBS ${LIBS} Qt6::CorePrivate)
-    set(ANDROID_ABIS ANDROID_TARGET_ARCH)
+    # set(ANDROID_ABIS ANDROID_TARGET_ARCH)
 
     add_compile_definitions(MVPN_ANDROID)
 
@@ -283,7 +283,7 @@ if(ANDROID)
     )
 
     set(SOURCES ${SOURCES}
-        ${CMAKE_CURRENT_LIST_DIR}/platforms/android/android_controller.cp
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/android/android_controller.cpp
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/android_notificationhandler.cpp
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/androidutils.cpp
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/androidvpnactivity.cpp
@@ -469,8 +469,6 @@ set_source_files_properties(
 endif()
 
 if(ANDROID)
-    set(QT_ANDROID_BUILD_ALL_ABIS ON)
-
     add_custom_command(
         TARGET ${PROJECT} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy
diff --git a/client/ui/pages_logic/QrDecoderLogic.cpp b/client/ui/pages_logic/QrDecoderLogic.cpp
index 0c24ca1cc..764a6e4b3 100644
--- a/client/ui/pages_logic/QrDecoderLogic.cpp
+++ b/client/ui/pages_logic/QrDecoderLogic.cpp
@@ -3,10 +3,6 @@
 #include "ui/uilogic.h"
 #include "ui/pages_logic/StartPageLogic.h"
 
-#if defined(Q_OS_ANDROID)
-#include "android_controller.h"
-#endif
-
 using namespace amnezia;
 using namespace PageEnumNS;
 
diff --git a/client/ui/pages_logic/ServerSettingsLogic.cpp b/client/ui/pages_logic/ServerSettingsLogic.cpp
index 14927f9f3..05d449057 100644
--- a/client/ui/pages_logic/ServerSettingsLogic.cpp
+++ b/client/ui/pages_logic/ServerSettingsLogic.cpp
@@ -2,7 +2,6 @@
 #include "vpnconnection.h"
 
 #include "../uilogic.h"
-#include "ServerListLogic.h"
 #include "ShareConnectionLogic.h"
 #include "VpnLogic.h"
 
@@ -11,7 +10,7 @@
 #include <QTimer>
 
 #if defined(Q_OS_ANDROID)
-#include "androidutils.h"
+#include "../../platforms/android/androidutils.h"
 #endif
 
 ServerSettingsLogic::ServerSettingsLogic(UiLogic *logic, QObject *parent):
diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp
index 03ace70a0..8c59369a1 100644
--- a/client/ui/pages_logic/StartPageLogic.cpp
+++ b/client/ui/pages_logic/StartPageLogic.cpp
@@ -12,7 +12,7 @@
 
 #ifdef Q_OS_ANDROID
 #include <QJniObject>
-#include "androidutils.h"
+#include "../../platforms/android/androidutils.h"
 #endif
 
 StartPageLogic::StartPageLogic(UiLogic *logic, QObject *parent):
diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 07d81caf7..69b5b9a55 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -19,7 +19,7 @@
 #endif
 
 #ifdef Q_OS_ANDROID
-#include "android_controller.h"
+#include "../../platforms/android/android_controller.h"
 #include "protocols/android_vpnprotocol.h"
 #endif
 

From a30e478cbd87c962d5cc5ed4fff8f5dae261bd10 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 27 Dec 2022 17:14:44 +0300
Subject: [PATCH 07/49] Fix of cmake build

---
 client/3rd/QtSsh/src/botan/botan.cmake | 6 ------
 client/CMakeLists.txt                  | 4 ++--
 client/cmake/3rdparty.cmake            | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/client/3rd/QtSsh/src/botan/botan.cmake b/client/3rd/QtSsh/src/botan/botan.cmake
index 0dce1f5eb..24a35d1c2 100644
--- a/client/3rd/QtSsh/src/botan/botan.cmake
+++ b/client/3rd/QtSsh/src/botan/botan.cmake
@@ -39,14 +39,12 @@ if(ANDROID)
     # As QAndroidBinder is not yet implemented with a public api
     set(LIBS ${LIBS} Qt6::CorePrivate)
 
-    message("botan target arch ${CMAKE_ANDROID_ARCH_ABI}")
     set(abi ${CMAKE_ANDROID_ARCH_ABI})
 
     include_directories(${CMAKE_CURRENT_LIST_DIR}/android/${abi})
     link_directories(${CMAKE_CURRENT_LIST_DIR}/android/${abi})
     set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/android/${abi}/botan_all.h)
     set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/android/${abi}/botan_all.cpp)
-
 endif()
 
 if(IOS)
@@ -70,8 +68,4 @@ if(IOS)
     include_directories(${CMAKE_CURRENT_LIST_DIR}/ios/iphone)
     set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/ios/iphone/botan_all.h)
     set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/ios/iphone/botan_all.cpp)
-
-
-
-
 endif()
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index e78e03c9a..8f84b25ca 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -503,8 +503,8 @@ if(ANDROID)
         ${CMAKE_CURRENT_LIST_DIR}/android
     )
 
-    foreach(abi IN LISTS ${QT_ANDROID_ABIS})
-        if(ANDROID_TARGET_ARCH EQUAL ${abi})
+    foreach(abi IN ITEMS ${QT_ANDROID_ABIS})
+        if(CMAKE_ANDROID_ARCH_ABI STREQUAL ${abi})
             set(LIBS ${LIBS}
                 ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/lib/android/${abi}/libcrypto.a
                 ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/lib/android/${abi}/libssl.a
diff --git a/client/cmake/3rdparty.cmake b/client/cmake/3rdparty.cmake
index 2fcfa9d1f..a87b4df57 100644
--- a/client/cmake/3rdparty.cmake
+++ b/client/cmake/3rdparty.cmake
@@ -19,8 +19,8 @@ add_subdirectory(${CLIENT_ROOT_DIR}/3rd/qtkeychain)
 set(LIBS ${LIBS} qt6keychain)
 
 include_directories(
-    ${CLIENT_ROOT_DIR}/3rd/QSimpleCrypto/include
     ${CLIENT_ROOT_DIR}/3rd/OpenSSL/include
+    ${CLIENT_ROOT_DIR}/3rd/QSimpleCrypto/include
     ${CLIENT_ROOT_DIR}/3rd/qtkeychain
     ${CMAKE_CURRENT_BINARY_DIR}/3rd/qtkeychain
 )

From 7851047421fbad7bdd929a1afcc4d05095a16a57 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 27 Dec 2022 17:54:14 +0300
Subject: [PATCH 08/49] multi-abi support

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8f2b7ed5..fa8418198 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 set(PROJECT AmneziaVPN)
 project(${PROJECT})
 
-#if(ANDROID)
-#    set(QT_ANDROID_BUILD_ALL_ABIS ON)
-#endif()
+if(ANDROID)
+    set(QT_ANDROID_BUILD_ALL_ABIS ON)
+endif()
 
 add_subdirectory(client)
 

From 41a4dc2fa2d1ad190430eaf6940d8a5b6fc591a3 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 27 Dec 2022 20:00:45 +0300
Subject: [PATCH 09/49] GitHub Actions fix

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 187150da8..7f61d4f16 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -242,7 +242,7 @@ jobs:
         host: 'linux'
         target: 'desktop'
         arch: 'gcc_64'
-        modules: 'qtremoteobjects qt5compat'
+        modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         set-env: 'true'

From 3e276c4111e75e1a3f8ae434c57afe4000b79723 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 27 Dec 2022 20:06:11 +0300
Subject: [PATCH 10/49] GitHub Actions fix #2

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 7f61d4f16..a4552a247 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -255,7 +255,7 @@ jobs:
         host: 'linux'
         target: 'android'
         arch: ${{ matrix.arch }}
-        modules: 'qtremoteobjects qt5compat'
+        modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         set-env: 'true'

From fd9fec48a2fd2ad0a6e3f0b6ec8d00f12c879d37 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 28 Dec 2022 13:10:34 +0300
Subject: [PATCH 11/49] Replacing of qmake on cmake for GitHub Actions

---
 deploy/build_android.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index e87993941..2bc7965be 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -44,12 +44,15 @@ $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -v
 echo "Building App..."
 cd $BUILD_DIR
 
-$QT_BIN_DIR/qmake  -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro
-echo "Executing make... may take long time"
-$ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -j2
-echo "Make install..."
-$ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make install INSTALL_ROOT=android
-echo "Build OK"
+$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR
+cmake --build . --config release
+
+# $QT_BIN_DIR/qmake  -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro
+# echo "Executing make... may take long time"
+# $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -j2
+# echo "Make install..."
+# $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make install INSTALL_ROOT=android
+# echo "Build OK"
 
 echo "............Deploy.................."
 cd $OUT_APP_DIR

From 918aeb670e0482a72a8f4c5a361c72669e998a7e Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 28 Dec 2022 13:37:56 +0300
Subject: [PATCH 12/49] Added QT_HOST_PATH variable

---
 deploy/build_android.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index 2bc7965be..9071099fe 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -40,6 +40,8 @@ echo "Using Android NDK in $ANDROID_NDK_ROOT"
 $QT_BIN_DIR/qmake -v
 $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -v
 
+QT_HOST_PATH = $HOME/Qt/$QT_VERSION/gcc_64/bin
+
 # Build App
 echo "Building App..."
 cd $BUILD_DIR

From 0206623c6facc0d2e5259220061405e9c0bae5e0 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 28 Dec 2022 13:42:29 +0300
Subject: [PATCH 13/49] Correct way to set up QT_HOST_PATH variable

---
 .github/workflows/deploy.yml | 1 +
 deploy/build_android.sh      | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a4552a247..4c1c1e89e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -278,6 +278,7 @@ jobs:
 
     - name: 'Build project'
       run: |
+        export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }} //gcc_64"
         export NDK_VERSION=21d
         export ANDROID_NDK_PLATFORM=android-21
         export ANDROID_NDK_HOME=${{ runner.temp }}/android-ndk-r${NDK_VERSION}
diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index 9071099fe..150897556 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -40,14 +40,12 @@ echo "Using Android NDK in $ANDROID_NDK_ROOT"
 $QT_BIN_DIR/qmake -v
 $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -v
 
-QT_HOST_PATH = $HOME/Qt/$QT_VERSION/gcc_64/bin
-
 # Build App
 echo "Building App..."
 cd $BUILD_DIR
 
 $QT_BIN_DIR/qt-cmake -S $PROJECT_DIR
-cmake --build . --config release
+cmake -DQT_HOST_PATH=$QT_HOST_PATH --build . --config release
 
 # $QT_BIN_DIR/qmake  -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro
 # echo "Executing make... may take long time"

From da7bd91514ae749b7a90c176254cd3999b0a075e Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 28 Dec 2022 13:52:14 +0300
Subject: [PATCH 14/49] Little fix

---
 deploy/build_android.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index 150897556..87593ad12 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -44,8 +44,10 @@ $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -v
 echo "Building App..."
 cd $BUILD_DIR
 
-$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR
-cmake -DQT_HOST_PATH=$QT_HOST_PATH --build . --config release
+echo "HOST Qt: $QT_HOST_PATH"
+
+$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -DQT_HOST_PATH=$QT_HOST_PATH
+cmake --build . --config release
 
 # $QT_BIN_DIR/qmake  -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro
 # echo "Executing make... may take long time"

From 44c5b41cc7f4102c9e84edbe521dd32f885bea1f Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 28 Dec 2022 13:57:41 +0300
Subject: [PATCH 15/49] Little fix

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4c1c1e89e..2ca42f694 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -278,7 +278,7 @@ jobs:
 
     - name: 'Build project'
       run: |
-        export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }} //gcc_64"
+        export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64"
         export NDK_VERSION=21d
         export ANDROID_NDK_PLATFORM=android-21
         export ANDROID_NDK_HOME=${{ runner.temp }}/android-ndk-r${NDK_VERSION}

From 42038cd6e794fdb21a9bffb5ed7704a30f0a4553 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 28 Dec 2022 14:26:44 +0300
Subject: [PATCH 16/49] Fixed filenames

---
 client/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 8f84b25ca..9a709f328 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -486,9 +486,9 @@ if(ANDROID)
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/NotificationUtil.kt
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/Prefs.kt
-            ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/VpnLogger.kt
-            ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/VpnService.kt
-            ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/VpnServiceBinder.kt
+            ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/VPNLogger.kt
+            ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/VPNService.kt
+            ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/VPNServiceBinder.kt
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/AmneziaApp.kt
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/PackageManagerHelper.java
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/VPNActivity.kt

From 1a50ed031671e4d1593b148c70aeb138ee589665 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 28 Dec 2022 14:45:45 +0300
Subject: [PATCH 17/49] Increased java version on runner

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2ca42f694..dfc49f793 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -274,7 +274,7 @@ jobs:
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: '8'
+        java-version: '11'
 
     - name: 'Build project'
       run: |

From 4000041308b23a330afbf18a6c7a7f49f40009ec Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 28 Dec 2022 15:55:03 +0300
Subject: [PATCH 18/49] Fix of build type

---
 deploy/build_android.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index 87593ad12..668157ed9 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -46,7 +46,7 @@ cd $BUILD_DIR
 
 echo "HOST Qt: $QT_HOST_PATH"
 
-$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -DQT_HOST_PATH=$QT_HOST_PATH
+$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -DQT_HOST_PATH=$QT_HOST_PATH -DCMAKE_BUILD_TYPE=Release
 cmake --build . --config release
 
 # $QT_BIN_DIR/qmake  -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro
@@ -56,14 +56,14 @@ cmake --build . --config release
 # $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make install INSTALL_ROOT=android
 # echo "Build OK"
 
-echo "............Deploy.................."
-cd $OUT_APP_DIR
+# echo "............Deploy.................."
+# cd $OUT_APP_DIR
 
-$QT_BIN_DIR/androiddeployqt \
-    --output $OUT_APP_DIR/android \
-    --gradle \
-    --release \
-    --input android-AmneziaVPN-deployment-settings.json
+# $QT_BIN_DIR/androiddeployqt \
+#     --output $OUT_APP_DIR/android \
+#     --gradle \
+#     --release \
+#     --input android-AmneziaVPN-deployment-settings.json
     
 echo "............Copy apk.................."
 cp $OUT_APP_DIR/android/build/outputs/apk/release/android-release-unsigned.apk \

From ea17124d6d804cce6e2d8d9ebf3d74443b4f8ffc Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 28 Dec 2022 16:35:25 +0300
Subject: [PATCH 19/49] Fix of build type for GitHub Actions

---
 deploy/build_android.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index 668157ed9..82596eaf0 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -46,8 +46,8 @@ cd $BUILD_DIR
 
 echo "HOST Qt: $QT_HOST_PATH"
 
-$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -DQT_HOST_PATH=$QT_HOST_PATH -DCMAKE_BUILD_TYPE=Release
-cmake --build . --config release
+$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -DQT_HOST_PATH=$QT_HOST_PATH
+cmake --build . --config release -DCMAKE_BUILD_TYPE=Release
 
 # $QT_BIN_DIR/qmake  -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro
 # echo "Executing make... may take long time"

From 3e2835bef6974662696924546dee989f6cf1a289 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Thu, 29 Dec 2022 15:04:42 +0300
Subject: [PATCH 20/49] Rolling back GitHub Actions config

---
 deploy/build_android.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index 82596eaf0..a20673a53 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -46,8 +46,8 @@ cd $BUILD_DIR
 
 echo "HOST Qt: $QT_HOST_PATH"
 
-$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -DQT_HOST_PATH=$QT_HOST_PATH
-cmake --build . --config release -DCMAKE_BUILD_TYPE=Release
+$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -DQT_HOST_PATH=$QT_HOST_PATH -DCMAKE_BUILD_TYPE=Release
+cmake --build . --config Release
 
 # $QT_BIN_DIR/qmake  -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro
 # echo "Executing make... may take long time"

From d1990a4263c7126db3808079af119bd2436c0574 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Mon, 9 Jan 2023 13:46:45 +0300
Subject: [PATCH 21/49] Adopted GitHub Actions build config for Qt6

---
 CMakeLists.txt          |  6 +++---
 deploy/build_android.sh | 24 ++++++++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa8418198..d8f2b7ed5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 set(PROJECT AmneziaVPN)
 project(${PROJECT})
 
-if(ANDROID)
-    set(QT_ANDROID_BUILD_ALL_ABIS ON)
-endif()
+#if(ANDROID)
+#    set(QT_ANDROID_BUILD_ALL_ABIS ON)
+#endif()
 
 add_subdirectory(client)
 
diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index a20673a53..0d2d2aabf 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -46,8 +46,12 @@ cd $BUILD_DIR
 
 echo "HOST Qt: $QT_HOST_PATH"
 
-$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -DQT_HOST_PATH=$QT_HOST_PATH -DCMAKE_BUILD_TYPE=Release
-cmake --build . --config Release
+$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR \
+   -DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL="ON" \
+   -DQT_HOST_PATH=$QT_HOST_PATH \
+   -DCMAKE_BUILD_TYPE="Release"
+
+cmake --build . --config release
 
 # $QT_BIN_DIR/qmake  -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro
 # echo "Executing make... may take long time"
@@ -56,15 +60,15 @@ cmake --build . --config Release
 # $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make install INSTALL_ROOT=android
 # echo "Build OK"
 
-# echo "............Deploy.................."
-# cd $OUT_APP_DIR
+echo "............Deploy.................."
+cd $OUT_APP_DIR
 
-# $QT_BIN_DIR/androiddeployqt \
-#     --output $OUT_APP_DIR/android \
-#     --gradle \
-#     --release \
-#     --input android-AmneziaVPN-deployment-settings.json
+$QT_HOST_PATH/bin/androiddeployqt \
+    --output $OUT_APP_DIR/android-build \
+    --gradle \
+    --release \
+    --input android-AmneziaVPN-deployment-settings.json
     
 echo "............Copy apk.................."
-cp $OUT_APP_DIR/android/build/outputs/apk/release/android-release-unsigned.apk \
+cp $OUT_APP_DIR/android-build/build/outputs/apk/release/android-build-release-unsigned.apk \
    $PROJECT_DIR/AmneziaVPN-release-unsigned.apk

From 7c3be9f0b04053bd5b922b752fd441828dcf0784 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Mon, 9 Jan 2023 14:21:10 +0300
Subject: [PATCH 22/49] Update of NDK version

---
 .github/workflows/deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index dfc49f793..489f0fd28 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -279,13 +279,13 @@ jobs:
     - name: 'Build project'
       run: |
         export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64"
-        export NDK_VERSION=21d
-        export ANDROID_NDK_PLATFORM=android-21
+        export NDK_VERSION=23c
+        export ANDROID_NDK_PLATFORM=android-23
         export ANDROID_NDK_HOME=${{ runner.temp }}/android-ndk-r${NDK_VERSION}
         export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
 
         if [ ! -f $ANDROID_NDK_ROOT/ndk-build ]; then 
-          wget https://dl.google.com/android/repository/android-ndk-r${NDK_VERSION}-linux-x86_64.zip -qO ${{ runner.temp }}/ndk.zip &&
+          wget https://dl.google.com/android/repository/android-ndk-r${NDK_VERSION}-linux.zip -qO ${{ runner.temp }}/ndk.zip &&
           unzip -q -d ${{ runner.temp }} ${{ runner.temp }}/ndk.zip ; 
         fi
 

From 20e44aa8911fd0863748cfb9eaacf6cea6001b39 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 10 Jan 2023 13:19:19 +0300
Subject: [PATCH 23/49] Re-enabled multi-abi build

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8f2b7ed5..fa8418198 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 set(PROJECT AmneziaVPN)
 project(${PROJECT})
 
-#if(ANDROID)
-#    set(QT_ANDROID_BUILD_ALL_ABIS ON)
-#endif()
+if(ANDROID)
+    set(QT_ANDROID_BUILD_ALL_ABIS ON)
+endif()
 
 add_subdirectory(client)
 

From 6b6a3cd38ee8733267ca7ce6388cb6705b2b598c Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Thu, 12 Jan 2023 14:16:05 +0300
Subject: [PATCH 24/49] [WIP] Android release workflow test

---
 .github/workflows/tag-deploy.yml | 121 +++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 .github/workflows/tag-deploy.yml

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
new file mode 100644
index 000000000..f80969740
--- /dev/null
+++ b/.github/workflows/tag-deploy.yml
@@ -0,0 +1,121 @@
+name: 'Deploy workflow'
+
+
+on: 
+  workflow_dispatch
+  # push:
+  # tags:
+  #   - **
+
+jobs:
+
+  Build-Android-Release:
+    name: 'Build-Android-Release'
+    runs-on: ubuntu-latest
+
+    env:
+      QT_VERSION: 6.4.1
+      QIF_VERSION: 4.5
+
+    steps:
+    - name: 'Install desktop Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'desktop'
+        arch: 'gcc_64'
+        modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z'
+
+    - name: 'Install android Qt x86_64'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'android'
+        arch: 'android_x86_64'
+        modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z'
+
+    - name: 'Install android Qt x86'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'android'
+        arch: 'android_x86'
+        modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z'
+
+    - name: 'Install android Qt arm_v7'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'android'
+        arch: 'android_armv7'
+        modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z'
+
+    - name: 'Install android Qt arm_v8'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'android'
+        arch: 'android_arm64_v8a'
+        modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z'
+
+    - name: 'Get sources'
+      uses: actions/checkout@v3
+      with:
+        submodules: 'true'
+        fetch-depth: 10
+
+    - name: 'Setup ccache'
+      uses: hendrikmuhs/ccache-action@v1.2
+
+    - name: 'Setup Java'
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '11'
+
+    - name: 'Build project'
+      run: |
+        export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64"
+        export NDK_VERSION=23c
+        export ANDROID_NDK_PLATFORM=android-23
+        export ANDROID_NDK_HOME=${{ runner.temp }}/android-ndk-r${NDK_VERSION}
+        export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
+
+        if [ ! -f $ANDROID_NDK_ROOT/ndk-build ]; then 
+          wget https://dl.google.com/android/repository/android-ndk-r${NDK_VERSION}-linux.zip -qO ${{ runner.temp }}/ndk.zip &&
+          unzip -q -d ${{ runner.temp }} ${{ runner.temp }}/ndk.zip ; 
+        fi
+
+        export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/${{ matrix.arch }}/bin
+        bash deploy/build_android.sh
+
+    - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: Release APK
+          path: deploy/build/client/android-build/build/outputs/apk/release/android-build-release-unsigned.apk

From 58da60985f2997c961a86c7430965af7d5392abb Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Thu, 12 Jan 2023 14:21:14 +0300
Subject: [PATCH 25/49] Error fix

---
 .github/workflows/tag-deploy.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index f80969740..1f19f44fc 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -1,8 +1,7 @@
-name: 'Deploy workflow'
+name: 'Release deploy workflow'
 
 
-on: 
-  workflow_dispatch
+on: [workflow_dispatch]
   # push:
   # tags:
   #   - **
@@ -114,7 +113,7 @@ jobs:
         export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/${{ matrix.arch }}/bin
         bash deploy/build_android.sh
 
-    - name: Upload
+    - name: 'Upload'
         uses: actions/upload-artifact@v3
         with:
           name: Release APK

From 1fd0794bfb0ba380e364c64943b80f125b3b7f47 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Thu, 12 Jan 2023 14:30:25 +0300
Subject: [PATCH 26/49] Workflow file formatting fix

---
 .github/workflows/tag-deploy.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index 1f19f44fc..196c8c688 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -114,7 +114,7 @@ jobs:
         bash deploy/build_android.sh
 
     - name: 'Upload'
-        uses: actions/upload-artifact@v3
-        with:
-          name: Release APK
-          path: deploy/build/client/android-build/build/outputs/apk/release/android-build-release-unsigned.apk
+      uses: actions/upload-artifact@v3
+      with:
+        name: Release APK
+        path: deploy/build/client/android-build/build/outputs/apk/release/android-build-release-unsigned.apk

From 2d8957489e82601d208b137e7e62c2cc637524fb Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Thu, 12 Jan 2023 14:55:11 +0300
Subject: [PATCH 27/49] Trigger alternative syntax

---
 .github/workflows/tag-deploy.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index 196c8c688..75994b6a5 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -1,7 +1,6 @@
 name: 'Release deploy workflow'
 
-
-on: [workflow_dispatch]
+on: workflow_dispatch
   # push:
   # tags:
   #   - **

From 58371e6e43051018dec1a52141cf6784061dde63 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Thu, 12 Jan 2023 15:12:55 +0300
Subject: [PATCH 28/49] New trigger for a workflow

---
 .github/workflows/tag-deploy.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index 75994b6a5..284e50538 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -1,6 +1,8 @@
 name: 'Release deploy workflow'
 
-on: workflow_dispatch
+on: 
+  workflow_dispatch:
+  push:
   # push:
   # tags:
   #   - **

From 6ed9dcbe932a8df32fa3554f7accc7cd9c210594 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Thu, 12 Jan 2023 15:19:39 +0300
Subject: [PATCH 29/49] Workflow build script fix

---
 .github/workflows/tag-deploy.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index 284e50538..f14501f0e 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -2,7 +2,6 @@ name: 'Release deploy workflow'
 
 on: 
   workflow_dispatch:
-  push:
   # push:
   # tags:
   #   - **
@@ -111,7 +110,7 @@ jobs:
           unzip -q -d ${{ runner.temp }} ${{ runner.temp }}/ndk.zip ; 
         fi
 
-        export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/${{ matrix.arch }}/bin
+        export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android_arm64_v8a/bin
         bash deploy/build_android.sh
 
     - name: 'Upload'

From e8242aec85df1d8b33cf39b3fd1b390c74502f2b Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Thu, 12 Jan 2023 15:36:31 +0300
Subject: [PATCH 30/49] Android build script fix

---
 deploy/build_android.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index 0d2d2aabf..9791abbbb 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -37,8 +37,8 @@ echo "Using Android SDK in $ANDROID_SDK_ROOT"
 echo "Using Android NDK in $ANDROID_NDK_ROOT"
 
 # Checking env
-$QT_BIN_DIR/qmake -v
-$ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -v
+# $QT_BIN_DIR/qmake -v
+# $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -v
 
 # Build App
 echo "Building App..."

From 32cbb698ee7cc53371a6a06388d30ca3ac32167d Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Mon, 16 Jan 2023 14:30:08 +0300
Subject: [PATCH 31/49] Support of apk signing for tag-deploy workflow

---
 .github/workflows/tag-deploy.yml | 29 ++++++++++++++++++++++++++++-
 deploy/build_android.sh          | 21 ++-------------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index f14501f0e..f9d869ab5 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -97,6 +97,28 @@ jobs:
         distribution: 'temurin'
         java-version: '11'
 
+    - name: 'Getting keystore'
+      uses: actions/checkout@v3  
+      with:
+        repository: amnezia-vpn/amnezia-android-certificates
+        token: ${{ secrets.CERTS_ACCESS_TOKEN }}
+
+    - name: 'Install Android Build Tools'
+      run: |
+        RUNNER_TMP_DIR=${{ runner.temp }}
+
+        ANDROID_BUILD_TOOLS_VERSION=30.0.3
+
+        BUILD_TOOLS_UNZIP_PATH=$RUNNER_TMP_DIR/build-tools
+        BUILD_TOOLS_ARCHIVE=$RUNNER_TMP_DIR/build-tools.zip
+
+        if [ ! -f $BUILD_TOOLS_UNZIP_PATH ]; then 
+            wget http://dl.google.com/android/repository/build-tools_r${ANDROID_BUILD_TOOLS_VERSION}-linux.zip -qO $BUILD_TOOLS_ARCHIVE;
+            unzip -q -d $BUILD_TOOLS_UNZIP_PATH $BUILD_TOOLS_ARCHIVE;
+        fi
+
+        export BUILD_TOOLS_PATH=$RUNNER_TMP_DIR/build-tools/android-11
+
     - name: 'Build project'
       run: |
         export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64"
@@ -113,8 +135,13 @@ jobs:
         export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android_arm64_v8a/bin
         bash deploy/build_android.sh
 
+    - name: 'Signing APK'
+      run: |
+        ${BUILD_TOOLS_PATH}/zipalign -f -v 4 AmneziaVPN-release-unsigned.apk AmneziaVPN-release-aligned.apk
+        ${BUILD_TOOLS_PATH}/apksigner sign --out AmneziaVPN-release-signed.apk --ks debug.keystore --ks-key-alias ${{ secrets.DEBUG_KEYSTORE_KEY_ALIAS }} --ks-pass pass:${{secrets.DEBUG_KEYSTOTE_KEY_PASS }}  AmneziaVPN-release-aligned.apk
+
     - name: 'Upload'
       uses: actions/upload-artifact@v3
       with:
         name: Release APK
-        path: deploy/build/client/android-build/build/outputs/apk/release/android-build-release-unsigned.apk
+        path: ${{ runner.temp }}/AmneziaVPN-release-signed.apk
diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index 9791abbbb..0c994a865 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -20,12 +20,6 @@ APP_DOMAIN=org.amneziavpn.package
 OUT_APP_DIR=$BUILD_DIR/client
 BUNDLE_DIR=$OUT_APP_DIR/$APP_FILENAME
 
-INSTALLER_DATA_DIR=$BUILD_DIR/installer/packages/$APP_DOMAIN/data
-INSTALLER_BUNDLE_DIR=$BUILD_DIR/installer/$APP_FILENAME
-
-PRO_FILE_PATH=$PROJECT_DIR/$APP_NAME.pro
-QMAKE_STASH_FILE=$PROJECT_DIR/.qmake_stash
-
 # Seacrh Qt
 if [ -z "${QT_VERSION+x}" ]; then
 QT_VERSION=5.15.2;
@@ -36,10 +30,6 @@ echo "Using Qt in $QT_BIN_DIR"
 echo "Using Android SDK in $ANDROID_SDK_ROOT"
 echo "Using Android NDK in $ANDROID_NDK_ROOT"
 
-# Checking env
-# $QT_BIN_DIR/qmake -v
-# $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -v
-
 # Build App
 echo "Building App..."
 cd $BUILD_DIR
@@ -53,14 +43,7 @@ $QT_BIN_DIR/qt-cmake -S $PROJECT_DIR \
 
 cmake --build . --config release
 
-# $QT_BIN_DIR/qmake  -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro
-# echo "Executing make... may take long time"
-# $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -j2
-# echo "Make install..."
-# $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make install INSTALL_ROOT=android
-# echo "Build OK"
-
-echo "............Deploy.................."
+echo "............APK generation.................."
 cd $OUT_APP_DIR
 
 $QT_HOST_PATH/bin/androiddeployqt \
@@ -68,7 +51,7 @@ $QT_HOST_PATH/bin/androiddeployqt \
     --gradle \
     --release \
     --input android-AmneziaVPN-deployment-settings.json
-    
+   
 echo "............Copy apk.................."
 cp $OUT_APP_DIR/android-build/build/outputs/apk/release/android-build-release-unsigned.apk \
    $PROJECT_DIR/AmneziaVPN-release-unsigned.apk

From ff79ffd1c8356abf367fae533413e83220e4b41d Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Mon, 16 Jan 2023 15:10:57 +0000
Subject: [PATCH 32/49] Android tag deploy fix

---
 .github/workflows/tag-deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index f9d869ab5..53bd3fee4 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -101,7 +101,7 @@ jobs:
       uses: actions/checkout@v3  
       with:
         repository: amnezia-vpn/amnezia-android-certificates
-        token: ${{ secrets.CERTS_ACCESS_TOKEN }}
+        ssh-key: ${{ secrets.ANDROID_CERTS_SSH_PRIVATE_KEY }}
 
     - name: 'Install Android Build Tools'
       run: |
@@ -138,7 +138,7 @@ jobs:
     - name: 'Signing APK'
       run: |
         ${BUILD_TOOLS_PATH}/zipalign -f -v 4 AmneziaVPN-release-unsigned.apk AmneziaVPN-release-aligned.apk
-        ${BUILD_TOOLS_PATH}/apksigner sign --out AmneziaVPN-release-signed.apk --ks debug.keystore --ks-key-alias ${{ secrets.DEBUG_KEYSTORE_KEY_ALIAS }} --ks-pass pass:${{secrets.DEBUG_KEYSTOTE_KEY_PASS }}  AmneziaVPN-release-aligned.apk
+        ${BUILD_TOOLS_PATH}/apksigner sign --out AmneziaVPN-release-signed.apk --ks debug.keystore --ks-key-alias ${{ secrets.DEBUG_ANDROID_KEYSTORE_KEY_ALIAS }} --ks-pass pass:${{secrets.DEBUG_ANDROID_KEYSTOTE_KEY_PASS }}  AmneziaVPN-release-aligned.apk
 
     - name: 'Upload'
       uses: actions/upload-artifact@v3

From c3f423aad57f65c42819a00de85b7dd39085b288 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 17 Jan 2023 10:27:14 +0300
Subject: [PATCH 33/49] Little cleanup

---
 client/client.pro                             |  3 ---
 client/platforms/android/android_controller.h | 17 -----------------
 deploy/build_android.sh                       |  6 ------
 3 files changed, 26 deletions(-)

diff --git a/client/client.pro b/client/client.pro
index b742cefe0..7cc0f455c 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -251,9 +251,6 @@ android {
         QT += core-private
         ANDROID_ABIS = $$ANDROID_TARGET_ARCH
     }
-#    else {
-#        QT += androidextras
-#    }
 
    DEFINES += MVPN_ANDROID
 
diff --git a/client/platforms/android/android_controller.h b/client/platforms/android/android_controller.h
index bd2c2f018..73877b5a4 100644
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@@ -71,23 +71,6 @@ private:
     bool m_serviceConnected = false;
     std::function<void(const QString&)> m_logCallback;
 
-//    QAndroidBinder m_serviceBinder;
-//    class VPNBinder : public QAndroidBinder {
-//     public:
-//      VPNBinder(AndroidController* controller) : m_controller(controller) {}
-
-//      bool onTransact(int code, const QAndroidParcel& data,
-//                      const QAndroidParcel& reply,
-//                      QAndroidBinder::CallType flags) override;
-
-//      QString readUTF8Parcel(QAndroidParcel data);
-
-//     private:
-//      AndroidController* m_controller = nullptr;
-//    };
-
-//    VPNBinder m_binder;
-
     static void startActivityForResult(JNIEnv* env, jobject /*thiz*/, jobject intent);
 };
 
diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index 0c994a865..48b3bf5d1 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -20,12 +20,6 @@ APP_DOMAIN=org.amneziavpn.package
 OUT_APP_DIR=$BUILD_DIR/client
 BUNDLE_DIR=$OUT_APP_DIR/$APP_FILENAME
 
-# Seacrh Qt
-if [ -z "${QT_VERSION+x}" ]; then
-QT_VERSION=5.15.2;
-QT_BIN_DIR=$HOME/Qt/$QT_VERSION/android/bin
-fi
-
 echo "Using Qt in $QT_BIN_DIR"
 echo "Using Android SDK in $ANDROID_SDK_ROOT"
 echo "Using Android NDK in $ANDROID_NDK_ROOT"

From c3c87bff74c31761c588d9e4d4efa6002004a9bb Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 17 Jan 2023 15:32:06 +0300
Subject: [PATCH 34/49] Fix of GitHub Actions build

---
 .github/workflows/deploy.yml                            | 1 +
 client/android/build.gradle                             | 6 +++---
 client/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 deploy/build_android.sh                                 | 9 ++++++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index db26dfee5..397dc18a5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -296,6 +296,7 @@ jobs:
         export ANDROID_NDK_PLATFORM=android-23
         export ANDROID_NDK_HOME=${{ runner.temp }}/android-ndk-r${NDK_VERSION}
         export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
+        export ANDROID_CURRENT_ARCH=${{ matrix.arch }}
 
         if [ ! -f $ANDROID_NDK_ROOT/ndk-build ]; then 
           wget https://dl.google.com/android/repository/android-ndk-r${NDK_VERSION}-linux.zip -qO ${{ runner.temp }}/ndk.zip &&
diff --git a/client/android/build.gradle b/client/android/build.gradle
index 69eda3e58..49ef8758c 100644
--- a/client/android/build.gradle
+++ b/client/android/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.github.ben-manes.versions'
 
 buildscript {
    ext{
-       kotlin_version = "1.4.30-M1"
+       kotlin_version = "1.6.20"
        //  for libwg
        appcompatVersion = '1.1.0'
        annotationsVersion = '1.0.1'
@@ -20,7 +20,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
         classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -121,7 +121,7 @@ android {
     defaultConfig {
         resConfig "en"
         minSdkVersion = 24
-        targetSdkVersion = 30
+        targetSdkVersion = 31
         versionCode 10 // Change to a higher number
         versionName "2.0.10" // Change to a higher number
 
diff --git a/client/android/gradle/wrapper/gradle-wrapper.properties b/client/android/gradle/wrapper/gradle-wrapper.properties
index 669386b87..92f06b50f 100644
--- a/client/android/gradle/wrapper/gradle-wrapper.properties
+++ b/client/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index 48b3bf5d1..d9d8f5c77 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -20,6 +20,12 @@ APP_DOMAIN=org.amneziavpn.package
 OUT_APP_DIR=$BUILD_DIR/client
 BUNDLE_DIR=$OUT_APP_DIR/$APP_FILENAME
 
+# Seacrh Qt
+if [ -z "${QT_VERSION+x}" ]; then
+QT_VERSION=6.4.1;
+QT_BIN_DIR=$HOME/Qt/$QT_VERSION/$ANDROID_CURRENT_ARCH/bin
+fi
+
 echo "Using Qt in $QT_BIN_DIR"
 echo "Using Android SDK in $ANDROID_SDK_ROOT"
 echo "Using Android NDK in $ANDROID_NDK_ROOT"
@@ -44,7 +50,8 @@ $QT_HOST_PATH/bin/androiddeployqt \
     --output $OUT_APP_DIR/android-build \
     --gradle \
     --release \
-    --input android-AmneziaVPN-deployment-settings.json
+    --input android-AmneziaVPN-deployment-settings.json \
+    --android-platform android-33
    
 echo "............Copy apk.................."
 cp $OUT_APP_DIR/android-build/build/outputs/apk/release/android-build-release-unsigned.apk \

From e261a8ba213f539c3b76414fbc21082769c4a385 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 17 Jan 2023 15:53:54 +0300
Subject: [PATCH 35/49] Shadowsocks manifest fix

---
 .../shadowsocks/src/main/AndroidManifest.xml  | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/client/android/shadowsocks/src/main/AndroidManifest.xml b/client/android/shadowsocks/src/main/AndroidManifest.xml
index 9769ab7af..e6200d93f 100644
--- a/client/android/shadowsocks/src/main/AndroidManifest.xml
+++ b/client/android/shadowsocks/src/main/AndroidManifest.xml
@@ -68,7 +68,8 @@
             android:name="org.amnezia.vpn.shadowsocks.core.BootReceiver"
             android:directBootAware="true"
             android:enabled="false"
-            android:process=":QtOnlyProcess">
+            android:process=":QtOnlyProcess"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
@@ -79,53 +80,63 @@
         <provider
             android:name="androidx.work.impl.WorkManagerInitializer"
             android:authorities="androidx.work.impl.WorkManagerInitializer"
-            tools:node="remove" />
+            tools:node="remove"
+            android:exported="true"/>
 
         <service
             android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware" />
+            tools:replace="android:directBootAware"
+            android:exported="true"/>
         <service
             android:name="androidx.work.impl.background.systemjob.SystemJobService"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware" />
+            tools:replace="android:directBootAware"
+            android:exported="true" />
 
         <receiver
             android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware" />
+            tools:replace="android:directBootAware"
+            android:exported="true" />
         <receiver
             android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$BatteryChargingProxy"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware" />
+            tools:replace="android:directBootAware"
+            android:exported="true" />
         <receiver
             android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$BatteryNotLowProxy"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware" />
+            tools:replace="android:directBootAware"
+            android:exported="true" />
         <receiver
             android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$StorageNotLowProxy"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware" />
+            tools:replace="android:directBootAware"
+            android:exported="true" />
         <receiver
             android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$NetworkStateProxy"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware" />
+            tools:replace="android:directBootAware"
+            android:exported="true" />
         <receiver
             android:name="androidx.work.impl.background.systemalarm.RescheduleReceiver"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware" />
+            tools:replace="android:directBootAware"
+            android:exported="true" />
         <receiver
             android:name="androidx.work.impl.background.systemalarm.ConstraintProxyUpdateReceiver"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware" />
+            tools:replace="android:directBootAware"
+            android:exported="true" />
     </application>
 </manifest>

From 732d018819420bc055d099a85606c1a9fa97f475 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 17 Jan 2023 16:09:06 +0300
Subject: [PATCH 36/49] Revert "Shadowsocks manifest fix"

This reverts commit e261a8ba213f539c3b76414fbc21082769c4a385.
---
 .../shadowsocks/src/main/AndroidManifest.xml  | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/client/android/shadowsocks/src/main/AndroidManifest.xml b/client/android/shadowsocks/src/main/AndroidManifest.xml
index e6200d93f..9769ab7af 100644
--- a/client/android/shadowsocks/src/main/AndroidManifest.xml
+++ b/client/android/shadowsocks/src/main/AndroidManifest.xml
@@ -68,8 +68,7 @@
             android:name="org.amnezia.vpn.shadowsocks.core.BootReceiver"
             android:directBootAware="true"
             android:enabled="false"
-            android:process=":QtOnlyProcess"
-            android:exported="true">
+            android:process=":QtOnlyProcess">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
@@ -80,63 +79,53 @@
         <provider
             android:name="androidx.work.impl.WorkManagerInitializer"
             android:authorities="androidx.work.impl.WorkManagerInitializer"
-            tools:node="remove"
-            android:exported="true"/>
+            tools:node="remove" />
 
         <service
             android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware"
-            android:exported="true"/>
+            tools:replace="android:directBootAware" />
         <service
             android:name="androidx.work.impl.background.systemjob.SystemJobService"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware"
-            android:exported="true" />
+            tools:replace="android:directBootAware" />
 
         <receiver
             android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware"
-            android:exported="true" />
+            tools:replace="android:directBootAware" />
         <receiver
             android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$BatteryChargingProxy"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware"
-            android:exported="true" />
+            tools:replace="android:directBootAware" />
         <receiver
             android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$BatteryNotLowProxy"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware"
-            android:exported="true" />
+            tools:replace="android:directBootAware" />
         <receiver
             android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$StorageNotLowProxy"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware"
-            android:exported="true" />
+            tools:replace="android:directBootAware" />
         <receiver
             android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$NetworkStateProxy"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware"
-            android:exported="true" />
+            tools:replace="android:directBootAware" />
         <receiver
             android:name="androidx.work.impl.background.systemalarm.RescheduleReceiver"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware"
-            android:exported="true" />
+            tools:replace="android:directBootAware" />
         <receiver
             android:name="androidx.work.impl.background.systemalarm.ConstraintProxyUpdateReceiver"
             android:directBootAware="true"
             android:process=":QtOnlyProcess"
-            tools:replace="android:directBootAware"
-            android:exported="true" />
+            tools:replace="android:directBootAware" />
     </application>
 </manifest>

From 53441148b87ccf165126e4f1a87ceff4159c1d88 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 17 Jan 2023 16:12:42 +0300
Subject: [PATCH 37/49] Revert of Gradle upgrade

---
 client/android/build.gradle                             | 6 +++---
 client/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 deploy/build_android.sh                                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/android/build.gradle b/client/android/build.gradle
index 49ef8758c..69eda3e58 100644
--- a/client/android/build.gradle
+++ b/client/android/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.github.ben-manes.versions'
 
 buildscript {
    ext{
-       kotlin_version = "1.6.20"
+       kotlin_version = "1.4.30-M1"
        //  for libwg
        appcompatVersion = '1.1.0'
        annotationsVersion = '1.0.1'
@@ -20,7 +20,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
         classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -121,7 +121,7 @@ android {
     defaultConfig {
         resConfig "en"
         minSdkVersion = 24
-        targetSdkVersion = 31
+        targetSdkVersion = 30
         versionCode 10 // Change to a higher number
         versionName "2.0.10" // Change to a higher number
 
diff --git a/client/android/gradle/wrapper/gradle-wrapper.properties b/client/android/gradle/wrapper/gradle-wrapper.properties
index 92f06b50f..669386b87 100644
--- a/client/android/gradle/wrapper/gradle-wrapper.properties
+++ b/client/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index d9d8f5c77..befa88f48 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -51,7 +51,7 @@ $QT_HOST_PATH/bin/androiddeployqt \
     --gradle \
     --release \
     --input android-AmneziaVPN-deployment-settings.json \
-    --android-platform android-33
+    --android-platform android-30
    
 echo "............Copy apk.................."
 cp $OUT_APP_DIR/android-build/build/outputs/apk/release/android-build-release-unsigned.apk \

From 0a6da5ead19fbf18e16b0371e3c3ef0fe20f8956 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 17 Jan 2023 16:23:34 +0300
Subject: [PATCH 38/49] Platform version fix

---
 deploy/build_android.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index befa88f48..4357034fc 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -51,7 +51,7 @@ $QT_HOST_PATH/bin/androiddeployqt \
     --gradle \
     --release \
     --input android-AmneziaVPN-deployment-settings.json \
-    --android-platform android-30
+    --android-platform android-31
    
 echo "............Copy apk.................."
 cp $OUT_APP_DIR/android-build/build/outputs/apk/release/android-build-release-unsigned.apk \

From 6b3209e6ee480fec7f51d25d5bdb40d95167dc5a Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Tue, 17 Jan 2023 16:59:34 +0300
Subject: [PATCH 39/49] Changing of the way of keystore fetching

---
 .github/workflows/tag-deploy.yml | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index 53bd3fee4..cf5a36217 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -97,30 +97,21 @@ jobs:
         distribution: 'temurin'
         java-version: '11'
 
+    - name: 'Preparations before keystore fetching'
+      run: | 
+        mkdir keystore
+        cd keystore
+
     - name: 'Getting keystore'
       uses: actions/checkout@v3  
       with:
         repository: amnezia-vpn/amnezia-android-certificates
         ssh-key: ${{ secrets.ANDROID_CERTS_SSH_PRIVATE_KEY }}
 
-    - name: 'Install Android Build Tools'
-      run: |
-        RUNNER_TMP_DIR=${{ runner.temp }}
-
-        ANDROID_BUILD_TOOLS_VERSION=30.0.3
-
-        BUILD_TOOLS_UNZIP_PATH=$RUNNER_TMP_DIR/build-tools
-        BUILD_TOOLS_ARCHIVE=$RUNNER_TMP_DIR/build-tools.zip
-
-        if [ ! -f $BUILD_TOOLS_UNZIP_PATH ]; then 
-            wget http://dl.google.com/android/repository/build-tools_r${ANDROID_BUILD_TOOLS_VERSION}-linux.zip -qO $BUILD_TOOLS_ARCHIVE;
-            unzip -q -d $BUILD_TOOLS_UNZIP_PATH $BUILD_TOOLS_ARCHIVE;
-        fi
-
-        export BUILD_TOOLS_PATH=$RUNNER_TMP_DIR/build-tools/android-11
-
     - name: 'Build project'
       run: |
+        cd ..
+        
         export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64"
         export NDK_VERSION=23c
         export ANDROID_NDK_PLATFORM=android-23
@@ -137,8 +128,10 @@ jobs:
 
     - name: 'Signing APK'
       run: |
-        ${BUILD_TOOLS_PATH}/zipalign -f -v 4 AmneziaVPN-release-unsigned.apk AmneziaVPN-release-aligned.apk
-        ${BUILD_TOOLS_PATH}/apksigner sign --out AmneziaVPN-release-signed.apk --ks debug.keystore --ks-key-alias ${{ secrets.DEBUG_ANDROID_KEYSTORE_KEY_ALIAS }} --ks-pass pass:${{secrets.DEBUG_ANDROID_KEYSTOTE_KEY_PASS }}  AmneziaVPN-release-aligned.apk
+        ANDROID_BUILD_TOOLS_VERSION=30.0.3
+
+        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/zipalign -f -v 4 AmneziaVPN-release-unsigned.apk AmneziaVPN-release-aligned.apk
+        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/apksigner sign --out AmneziaVPN-release-signed.apk --ks debug.keystore --ks-key-alias ${{ secrets.DEBUG_ANDROID_KEYSTORE_KEY_ALIAS }} --ks-pass pass:${{secrets.DEBUG_ANDROID_KEYSTOTE_KEY_PASS }}  AmneziaVPN-release-aligned.apk
 
     - name: 'Upload'
       uses: actions/upload-artifact@v3

From 3c6280c419804c9fcf4c356f5020e691a086c30c Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 18 Jan 2023 10:54:24 +0300
Subject: [PATCH 40/49] Changing of path of keystore location

---
 .github/workflows/tag-deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index cf5a36217..1ea5a2260 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -99,19 +99,19 @@ jobs:
 
     - name: 'Preparations before keystore fetching'
       run: | 
-        mkdir keystore
-        cd keystore
+        mkdir ${{ runner.temp }}/keystore
 
     - name: 'Getting keystore'
       uses: actions/checkout@v3  
       with:
         repository: amnezia-vpn/amnezia-android-certificates
         ssh-key: ${{ secrets.ANDROID_CERTS_SSH_PRIVATE_KEY }}
+        path: ${{ runner.temp }}/keystore
 
     - name: 'Build project'
       run: |
         cd ..
-        
+
         export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64"
         export NDK_VERSION=23c
         export ANDROID_NDK_PLATFORM=android-23

From bc695246540f54cee2c3731345a67f34cfc01fcb Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 18 Jan 2023 11:06:58 +0300
Subject: [PATCH 41/49] Changing of path of keystore location

---
 .github/workflows/tag-deploy.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index 1ea5a2260..dd38af544 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -85,9 +85,21 @@ jobs:
     - name: 'Get sources'
       uses: actions/checkout@v3
       with:
+        path: main
         submodules: 'true'
         fetch-depth: 10
 
+    - name: 'Preparations before keystore fetching'
+      run: | 
+        mkdir keystore
+
+    - name: 'Getting keystore'
+      uses: actions/checkout@v3  
+      with:
+        repository: amnezia-vpn/amnezia-android-certificates
+        ssh-key: ${{ secrets.ANDROID_CERTS_SSH_PRIVATE_KEY }}
+        path: keystore
+
     - name: 'Setup ccache'
       uses: hendrikmuhs/ccache-action@v1.2
 
@@ -97,17 +109,6 @@ jobs:
         distribution: 'temurin'
         java-version: '11'
 
-    - name: 'Preparations before keystore fetching'
-      run: | 
-        mkdir ${{ runner.temp }}/keystore
-
-    - name: 'Getting keystore'
-      uses: actions/checkout@v3  
-      with:
-        repository: amnezia-vpn/amnezia-android-certificates
-        ssh-key: ${{ secrets.ANDROID_CERTS_SSH_PRIVATE_KEY }}
-        path: ${{ runner.temp }}/keystore
-
     - name: 'Build project'
       run: |
         cd ..

From 016f8083454da0e5a994ca5143fa6e4ebb67edaf Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 18 Jan 2023 11:11:27 +0300
Subject: [PATCH 42/49] Removing of unnecessary command

---
 .github/workflows/tag-deploy.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index dd38af544..be766112d 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -111,8 +111,6 @@ jobs:
 
     - name: 'Build project'
       run: |
-        cd ..
-
         export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64"
         export NDK_VERSION=23c
         export ANDROID_NDK_PLATFORM=android-23

From 41f2af8c4eb4c465b597d07406dabda7eee94ed8 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 18 Jan 2023 11:27:01 +0300
Subject: [PATCH 43/49] Some highlights were added

---
 .github/workflows/tag-deploy.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index be766112d..521499839 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -82,6 +82,11 @@ jobs:
         set-env: 'true'
         extra: '--external 7z'
 
+    - name: 'Preparations before getting sources'
+      run: | 
+        echo Working dir:
+        pwd
+
     - name: 'Get sources'
       uses: actions/checkout@v3
       with:
@@ -91,6 +96,8 @@ jobs:
 
     - name: 'Preparations before keystore fetching'
       run: | 
+        echo Working dir:
+        pwd
         mkdir keystore
 
     - name: 'Getting keystore'

From e149e32ce1480e64d97b89310439af5f05bccb16 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 18 Jan 2023 11:36:16 +0300
Subject: [PATCH 44/49] Changing the set of highlights

---
 .github/workflows/tag-deploy.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index 521499839..cfd2de1d9 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -82,11 +82,6 @@ jobs:
         set-env: 'true'
         extra: '--external 7z'
 
-    - name: 'Preparations before getting sources'
-      run: | 
-        echo Working dir:
-        pwd
-
     - name: 'Get sources'
       uses: actions/checkout@v3
       with:
@@ -96,8 +91,6 @@ jobs:
 
     - name: 'Preparations before keystore fetching'
       run: | 
-        echo Working dir:
-        pwd
         mkdir keystore
 
     - name: 'Getting keystore'
@@ -118,6 +111,8 @@ jobs:
 
     - name: 'Build project'
       run: |
+        pwd
+        
         export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64"
         export NDK_VERSION=23c
         export ANDROID_NDK_PLATFORM=android-23

From 6aed2902a7e28e780a7fbac39b05f5716e638a34 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 18 Jan 2023 14:37:58 +0300
Subject: [PATCH 45/49] Fixes in path of build

---
 .github/workflows/tag-deploy.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index cfd2de1d9..01d00c33b 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -111,8 +111,6 @@ jobs:
 
     - name: 'Build project'
       run: |
-        pwd
-        
         export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64"
         export NDK_VERSION=23c
         export ANDROID_NDK_PLATFORM=android-23
@@ -125,17 +123,17 @@ jobs:
         fi
 
         export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android_arm64_v8a/bin
-        bash deploy/build_android.sh
+        bash main/deploy/build_android.sh
 
     - name: 'Signing APK'
       run: |
         ANDROID_BUILD_TOOLS_VERSION=30.0.3
 
-        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/zipalign -f -v 4 AmneziaVPN-release-unsigned.apk AmneziaVPN-release-aligned.apk
-        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/apksigner sign --out AmneziaVPN-release-signed.apk --ks debug.keystore --ks-key-alias ${{ secrets.DEBUG_ANDROID_KEYSTORE_KEY_ALIAS }} --ks-pass pass:${{secrets.DEBUG_ANDROID_KEYSTOTE_KEY_PASS }}  AmneziaVPN-release-aligned.apk
+        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/zipalign -f -v 4 main/AmneziaVPN-release-unsigned.apk main/AmneziaVPN-release-aligned.apk
+        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/apksigner sign --out main/AmneziaVPN-release-signed.apk --ks debug.keystore --ks-key-alias ${{ secrets.DEBUG_ANDROID_KEYSTORE_KEY_ALIAS }} --ks-pass pass:${{secrets.DEBUG_ANDROID_KEYSTOTE_KEY_PASS }}  main/AmneziaVPN-release-aligned.apk
 
     - name: 'Upload'
       uses: actions/upload-artifact@v3
       with:
         name: Release APK
-        path: ${{ runner.temp }}/AmneziaVPN-release-signed.apk
+        path: ${{ runner.temp }}/main/AmneziaVPN-release-signed.apk

From 2118327ae01999589e00f290edba2cd3ad9bc148 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 18 Jan 2023 14:47:11 +0300
Subject: [PATCH 46/49] Fixes in path of build

---
 .github/workflows/tag-deploy.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index 01d00c33b..928fe37dd 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -123,14 +123,17 @@ jobs:
         fi
 
         export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android_arm64_v8a/bin
-        bash main/deploy/build_android.sh
+        cd main
+        bash deploy/build_android.sh
 
     - name: 'Signing APK'
       run: |
+        cd ..
+
         ANDROID_BUILD_TOOLS_VERSION=30.0.3
 
         ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/zipalign -f -v 4 main/AmneziaVPN-release-unsigned.apk main/AmneziaVPN-release-aligned.apk
-        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/apksigner sign --out main/AmneziaVPN-release-signed.apk --ks debug.keystore --ks-key-alias ${{ secrets.DEBUG_ANDROID_KEYSTORE_KEY_ALIAS }} --ks-pass pass:${{secrets.DEBUG_ANDROID_KEYSTOTE_KEY_PASS }}  main/AmneziaVPN-release-aligned.apk
+        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/apksigner sign --out main/AmneziaVPN-release-signed.apk --ks keystore/debug.keystore --ks-key-alias ${{ secrets.DEBUG_ANDROID_KEYSTORE_KEY_ALIAS }} --ks-pass pass:${{secrets.DEBUG_ANDROID_KEYSTOTE_KEY_PASS }}  main/AmneziaVPN-release-aligned.apk
 
     - name: 'Upload'
       uses: actions/upload-artifact@v3

From 30ae13b245a15d4683de7374459639477e4d0738 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 18 Jan 2023 15:38:06 +0300
Subject: [PATCH 47/49] Fix of signing code

---
 .github/workflows/tag-deploy.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index 928fe37dd..677049ade 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -129,11 +129,12 @@ jobs:
     - name: 'Signing APK'
       run: |
         cd ..
+        pwd
 
         ANDROID_BUILD_TOOLS_VERSION=30.0.3
 
-        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/zipalign -f -v 4 main/AmneziaVPN-release-unsigned.apk main/AmneziaVPN-release-aligned.apk
-        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/apksigner sign --out main/AmneziaVPN-release-signed.apk --ks keystore/debug.keystore --ks-key-alias ${{ secrets.DEBUG_ANDROID_KEYSTORE_KEY_ALIAS }} --ks-pass pass:${{secrets.DEBUG_ANDROID_KEYSTOTE_KEY_PASS }}  main/AmneziaVPN-release-aligned.apk
+        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/zipalign -f -v 4 AmneziaVPN-release-unsigned.apk AmneziaVPN-release-aligned.apk
+        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/apksigner sign --out AmneziaVPN-release-signed.apk --ks keystore/debug.keystore --ks-key-alias ${{ secrets.DEBUG_ANDROID_KEYSTORE_KEY_ALIAS }} --ks-pass pass:${{secrets.DEBUG_ANDROID_KEYSTOTE_KEY_PASS }} AmneziaVPN-release-aligned.apk
 
     - name: 'Upload'
       uses: actions/upload-artifact@v3

From 6bebfb861c4b1f8ccce73c8830435481ae0988c0 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 18 Jan 2023 15:54:19 +0300
Subject: [PATCH 48/49] Little cleanup

---
 client/CMakeLists.txt                           | 1 -
 client/platforms/android/android_controller.h   | 7 ++-----
 client/platforms/android/androidvpnactivity.cpp | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 6dca9915b..7cb9f428c 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -268,7 +268,6 @@ if(ANDROID)
     # We need to include qtprivate api's
     # As QAndroidBinder is not yet implemented with a public api
     set(LIBS ${LIBS} Qt6::CorePrivate)
-    # set(ANDROID_ABIS ANDROID_TARGET_ARCH)
 
     add_compile_definitions(MVPN_ANDROID)
 
diff --git a/client/platforms/android/android_controller.h b/client/platforms/android/android_controller.h
index 73877b5a4..f09197dfb 100644
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@@ -11,6 +11,7 @@
 #include "ui/pages_logic/StartPageLogic.h"
 
 #include "protocols/vpnprotocol.h"
+
 using namespace amnezia;
 
 
@@ -38,10 +39,6 @@ public:
     void cleanupBackendLogs();
     void importConfig(const QString& data);
 
-    // from QAndroidServiceConnection
-//    void onServiceConnected(const QString& name, const QAndroidBinder& serviceBinder) override;
-//    void onServiceDisconnected(const QString& name) override;
-
     const QJsonObject &vpnConfig() const;
     void setVpnConfig(const QJsonObject &newVpnConfig);
 
@@ -63,7 +60,7 @@ protected:
 
 private:
     bool m_init = false;
-    //Protocol m_protocol;
+
     QJsonObject m_vpnConfig;
 
     StartPageLogic *m_startPageLogic;
diff --git a/client/platforms/android/androidvpnactivity.cpp b/client/platforms/android/androidvpnactivity.cpp
index 5139352fa..0e8b9574e 100644
--- a/client/platforms/android/androidvpnactivity.cpp
+++ b/client/platforms/android/androidvpnactivity.cpp
@@ -48,7 +48,6 @@ void AndroidVPNActivity::maybeInit() {
 bool AndroidVPNActivity::handleBackButton(JNIEnv* env, jobject thiz) {
     Q_UNUSED(env);
     Q_UNUSED(thiz);
-    //  return Navigator::instance()->eventHandled();
 }
 
 void AndroidVPNActivity::connectService() {

From 92374966fbbc57e70692344992b499df3a543fb2 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Wed, 18 Jan 2023 16:12:30 +0300
Subject: [PATCH 49/49] Removing of unnecessary command

---
 .github/workflows/tag-deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/tag-deploy.yml b/.github/workflows/tag-deploy.yml
index 677049ade..b88390f49 100644
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -128,7 +128,6 @@ jobs:
 
     - name: 'Signing APK'
       run: |
-        cd ..
         pwd
 
         ANDROID_BUILD_TOOLS_VERSION=30.0.3