From ac74510d47a9d4330b6ed812ff819a70c0c0d063 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Wed, 31 Aug 2022 15:18:33 +0300
Subject: [PATCH] Some fixes for Qt6 Android

---
 client/3rd/QtSsh/src/botan/botan.pri          | 28 ++++++++++++++-----
 client/client.pro                             | 13 ++++++++-
 .../platforms/android/android_controller.cpp  | 17 ++++++-----
 client/platforms/android/android_controller.h |  5 ++--
 client/protocols/android_vpnprotocol.cpp      | 16 ++++++-----
 client/ui/qautostart.cpp                      |  6 ++--
 client/ui/uilogic.cpp                         |  2 +-
 7 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/client/3rd/QtSsh/src/botan/botan.pri b/client/3rd/QtSsh/src/botan/botan.pri
index 52847ed49..0c3f299b4 100644
--- a/client/3rd/QtSsh/src/botan/botan.pri
+++ b/client/3rd/QtSsh/src/botan/botan.pri
@@ -37,13 +37,27 @@ linux-g++ {
 }
 
 android {
-   for (abi, ANDROID_ABIS): {
-      equals(ANDROID_TARGET_ARCH,$$abi) {
-         INCLUDEPATH += $$PWD/android/$${abi}
-         HEADERS += $$PWD/android/$${abi}/botan_all.h
-         SOURCES += $$PWD/android/$${abi}/botan_all.cpp
-      }
-   }
+    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
+
+        INCLUDEPATH += $$PWD/android/$${ANDROID_TARGET_ARCH}
+        HEADERS += $$PWD/android/$${ANDROID_TARGET_ARCH}/botan_all.h
+        SOURCES += $$PWD/android/$${ANDROID_TARGET_ARCH}/botan_all.cpp
+    }
+    else {
+        QT += androidextras
+
+        for (abi, ANDROID_ABIS): {
+           equals(ANDROID_TARGET_ARCH,$$abi) {
+              INCLUDEPATH += $$PWD/android/$${abi}
+              HEADERS += $$PWD/android/$${abi}/botan_all.h
+              SOURCES += $$PWD/android/$${abi}/botan_all.cpp
+           }
+        }
+    }
 }
 
 ios: {
diff --git a/client/client.pro b/client/client.pro
index 472f477db..e0e59a0fa 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -231,7 +231,18 @@ win32|macx|linux:!android {
 }
 
 android {
-   QT += androidextras
+    message(Platform: android)
+    message("$$ANDROID_TARGET_ARCH")
+    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
+    }
+    else {
+        QT += androidextras
+    }
+
    DEFINES += MVPN_ANDROID
 
    INCLUDEPATH += platforms/android
diff --git a/client/platforms/android/android_controller.cpp b/client/platforms/android/android_controller.cpp
index 6b2c1aa0b..4b755ad8f 100644
--- a/client/platforms/android/android_controller.cpp
+++ b/client/platforms/android/android_controller.cpp
@@ -1,9 +1,9 @@
-#include <QAndroidBinder>
-#include <QAndroidIntent>
-#include <QAndroidJniEnvironment>
-#include <QAndroidJniObject>
-#include <QAndroidParcel>
-#include <QAndroidServiceConnection>
+//#include <QAndroidBinder>
+//#include <QAndroidIntent>
+//#include <QAndroidJniEnvironment>
+//#include <QAndroidJniObject>
+//#include <QAndroidParcel>
+//#include <QAndroidServiceConnection>
 #include <QDebug>
 #include <QHostAddress>
 #include <QJsonArray>
@@ -12,7 +12,10 @@
 #include <QRandomGenerator>
 #include <QTextCodec>
 #include <QTimer>
-#include <QtAndroid>
+//#include <QtAndroid>
+
+#include <QtCore/private/qandroidextras_p.h>
+
 
 #include "android_controller.h"
 #include "core/errorstrings.h"
diff --git a/client/platforms/android/android_controller.h b/client/platforms/android/android_controller.h
index a47344143..195a8c73d 100644
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@@ -1,8 +1,9 @@
 #ifndef ANDROID_CONTROLLER_H
 #define ANDROID_CONTROLLER_H
 
-#include <QAndroidBinder>
-#include <QAndroidServiceConnection>
+//#include <QAndroidBinder>
+//#include <QAndroidServiceConnection>
+#include <QtCore/private/qandroidextras_p.h>
 
 #include "protocols/vpnprotocol.h"
 using namespace amnezia;
diff --git a/client/protocols/android_vpnprotocol.cpp b/client/protocols/android_vpnprotocol.cpp
index 66e2eaf53..cf9e443aa 100644
--- a/client/protocols/android_vpnprotocol.cpp
+++ b/client/protocols/android_vpnprotocol.cpp
@@ -1,9 +1,9 @@
-#include <QAndroidBinder>
-#include <QAndroidIntent>
-#include <QAndroidJniEnvironment>
-#include <QAndroidJniObject>
-#include <QAndroidParcel>
-#include <QAndroidServiceConnection>
+//#include <QAndroidBinder>
+//#include <QAndroidIntent>
+//#include <QAndroidJniEnvironment>
+//#include <QAndroidJniObject>
+//#include <QAndroidParcel>
+//#include <QAndroidServiceConnection>
 #include <QDebug>
 #include <QHostAddress>
 #include <QJsonArray>
@@ -12,7 +12,9 @@
 #include <QRandomGenerator>
 #include <QTextCodec>
 #include <QTimer>
-#include <QtAndroid>
+//#include <QtAndroid>
+#include <QtCore/private/qandroidextras_p.h>
+
 
 #include "android_vpnprotocol.h"
 #include "core/errorstrings.h"
diff --git a/client/ui/qautostart.cpp b/client/ui/qautostart.cpp
index 3a9e2a79f..a7f49b2da 100644
--- a/client/ui/qautostart.cpp
+++ b/client/ui/qautostart.cpp
@@ -123,9 +123,9 @@ void Autostart::setAutostart(bool autostart) {
 
         if (file.open(QIODevice::ReadWrite)) {
             QTextStream stream(&file);
-            stream << "[Desktop Entry]" << endl;
-            stream << "Exec=" << appPath() << endl;
-            stream << "Type=Application" << endl;
+            stream << "[Desktop Entry]" << Qt::endl;
+            stream << "Exec=" << appPath() << Qt::endl;
+            stream << "Type=Application" << Qt::endl;
         }
     }
 }
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index 39fbc50b2..5f5cb619e 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -18,7 +18,7 @@
 #include <QTimer>
 #include <QRegularExpression>
 #include <QQmlFile>
-
+#include <QStandardPaths>
 #include "configurators/cloak_configurator.h"
 #include "configurators/vpn_configurator.h"
 #include "configurators/openvpn_configurator.h"