Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/qt6-client-management-panel

client/ui/pages_logic/QrDecoderLogic.cpp

@@ -3,15 +3,70 @@
 #include "ui/uilogic.h"
 #include "ui/pages_logic/StartPageLogic.h"
 
+#ifdef Q_OS_ANDROID
+#include <QJniEnvironment>
+#include <QJniObject>
+#include "../../platforms/android/androidutils.h"
+#endif
+
 using namespace amnezia;
 using namespace PageEnumNS;
 
+namespace {
+    QrDecoderLogic* mInstance = nullptr;
+    constexpr auto CLASSNAME = "org.amnezia.vpn.qt.CameraActivity";
+}
+
 QrDecoderLogic::QrDecoderLogic(UiLogic *logic, QObject *parent):
     PageLogicBase(logic, parent)
 {
+    mInstance = this;
 
+    #if (defined(Q_OS_ANDROID))
+        AndroidUtils::runOnAndroidThreadAsync([]() {
+            JNINativeMethod methods[]{
+                {"passDataToDecoder", "(Ljava/lang/String;)V", reinterpret_cast<void*>(onNewDataChunk)},
+            };
+
+            QJniObject javaClass(CLASSNAME);
+            QJniEnvironment env;
+            jclass objectClass = env->GetObjectClass(javaClass.object<jobject>());
+            env->RegisterNatives(objectClass, methods, sizeof(methods) / sizeof(methods[0]));
+            env->DeleteLocalRef(objectClass);
+        });
+    #endif
 }
 
+void QrDecoderLogic::stopDecodingQr()
+{
+    #if (defined(Q_OS_ANDROID))
+        QJniObject::callStaticMethod<void>(CLASSNAME, "stopQrCodeReader", "()V");
+    #endif
+
+    emit stopDecode();
+}
+
+#ifdef Q_OS_ANDROID
+void QrDecoderLogic::onNewDataChunk(JNIEnv *env, jobject thiz, jstring data)
+{
+    Q_UNUSED(thiz);
+    const char* buffer = env->GetStringUTFChars(data, nullptr);
+    if (!buffer) {
+        return;
+    }
+
+    QString parcelBody(buffer);
+    env->ReleaseStringUTFChars(data, buffer);
+
+    if (mInstance != nullptr) {
+        if (!mInstance->m_detectingEnabled) {
+            mInstance->onUpdatePage();
+        }
+        mInstance->onDetectedQrCode(parcelBody);
+    }
+}
+#endif
+
 void QrDecoderLogic::onUpdatePage()
 {
     m_chunks.clear();
@@ -24,7 +79,6 @@ void QrDecoderLogic::onUpdatePage()
 void QrDecoderLogic::onDetectedQrCode(const QString &code)
 {
     //qDebug() << code;
-
     if (!detectingEnabled()) return;
 
     // check if chunk received
@@ -32,12 +86,12 @@ void QrDecoderLogic::onDetectedQrCode(const QString &code)
     QDataStream s(&ba, QIODevice::ReadOnly);
     qint16 magic; s >> magic;
 
-
     if (magic == amnezia::qrMagicCode) {
         quint8 chunksCount; s >> chunksCount;
         if (totalChunksCount() != chunksCount) {
             m_chunks.clear();
         }
+
         set_totalChunksCount(chunksCount);
 
         quint8 chunkId; s >> chunkId;
@@ -46,6 +100,7 @@ void QrDecoderLogic::onDetectedQrCode(const QString &code)
 
         if (m_chunks.size() == totalChunksCount()) {
             QByteArray data;
+
             for (int i = 0; i < totalChunksCount(); ++i) {
                 data.append(m_chunks.value(i));
             }
@@ -53,21 +108,18 @@ void QrDecoderLogic::onDetectedQrCode(const QString &code)
             bool ok = uiLogic()->pageLogic<StartPageLogic>()->importConnectionFromQr(data);
             if (ok) {
                 set_detectingEnabled(false);
-                emit stopDecode();
-            }
-            else {
+                stopDecodingQr();
+            } else {
                 m_chunks.clear();
                 set_totalChunksCount(0);
                 set_receivedChunksCount(0);
             }
         }
-    }
-    else {
+    } else {
         bool ok = uiLogic()->pageLogic<StartPageLogic>()->importConnectionFromQr(ba);
         if (ok) {
             set_detectingEnabled(false);
-            emit stopDecode();
+            stopDecodingQr();
         }
     }
 }
-

client/ui/pages_logic/QrDecoderLogic.h

@@ -3,6 +3,10 @@
 
 #include "PageLogicBase.h"
 
+#ifdef Q_OS_ANDROID
+#include "jni.h"
+#endif
+
 class UiLogic;
 
 class QrDecoderLogic : public PageLogicBase
@@ -16,10 +20,17 @@ public:
     Q_INVOKABLE void onUpdatePage() override;
     Q_INVOKABLE void onDetectedQrCode(const QString &code);
 
+#ifdef Q_OS_ANDROID
+    static void onNewDataChunk(JNIEnv *env, jobject thiz, jstring data);
+#endif
+
 public:
     explicit QrDecoderLogic(UiLogic *uiLogic, QObject *parent = nullptr);
     ~QrDecoderLogic() = default;
 
+private:
+    void stopDecodingQr();
+
 signals:
     void startDecode();
     void stopDecode();

client/ui/pages_logic/StartPageLogic.cpp

@@ -13,6 +13,7 @@
 #ifdef Q_OS_ANDROID
 #include <QJniObject>
 #include "../../platforms/android/androidutils.h"
+#include "../../platforms/android/android_controller.h"
 #endif
 
 namespace {
@@ -184,6 +185,13 @@ void StartPageLogic::onPushButtonImportOpenFile()
     }
 }
 
+#ifdef Q_OS_ANDROID
+void StartPageLogic::startQrDecoder()
+{
+    AndroidController::instance()->startQrReaderActivity();
+}
+#endif
+
 bool StartPageLogic::importConnection(const QJsonObject &profile)
 {
     ServerCredentials credentials;

client/ui/pages_logic/StartPageLogic.h

@@ -31,6 +31,10 @@ public:
     Q_INVOKABLE void onPushButtonImport();
     Q_INVOKABLE void onPushButtonImportOpenFile();
 
+#ifdef Q_OS_ANDROID
+    Q_INVOKABLE void startQrDecoder();
+#endif
+
     bool importConnection(const QJsonObject &profile);
     bool importConnectionFromCode(QString code);
     bool importConnectionFromQr(const QByteArray &data);

client/ui/pages_logic/protocols/OpenVpnLogic.cpp

@@ -51,9 +51,15 @@ void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerCo
     set_lineEditSubnetText(openvpnConfig.value(config_key::subnet_address).
                                       toString(protocols::openvpn::defaultSubnetAddress));
 
-    QString trasnsport = openvpnConfig.value(config_key::transport_proto).
-            toString(protocols::openvpn::defaultTransportProto);
-
+    QString trasnsport;
+    if (container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
+        trasnsport = "tcp";
+        set_radioButtonUdpEnabled(false);
+        set_radioButtonTcpEnabled(false);
+    } else {
+        trasnsport = openvpnConfig.value(config_key::transport_proto).
+                toString(protocols::openvpn::defaultTransportProto);
+    }
     set_radioButtonUdpChecked(trasnsport == protocols::openvpn::defaultTransportProto);
     set_radioButtonTcpChecked(trasnsport != protocols::openvpn::defaultTransportProto);
 
@@ -80,12 +86,6 @@ void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerCo
             toString(protocols::openvpn::defaultAdditionalServerConfig);
     set_textAreaAdditionalServerConfig(additionalServerConfig);
 
-    if (container == DockerContainer::ShadowSocks) {
-        set_radioButtonUdpEnabled(false);
-        set_radioButtonTcpEnabled(false);
-        set_radioButtonTcpChecked(true);
-    }
-
     set_lineEditPortText(openvpnConfig.value(config_key::port).
                                     toString(protocols::openvpn::defaultPort));