Refactor AndroidUtils

client/cmake/android.cmake

@@ -27,7 +27,7 @@ link_directories(${CMAKE_CURRENT_SOURCE_DIR}/platforms/android)
 set(HEADERS ${HEADERS}
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_controller.h
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_notificationhandler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidutils.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_utils.h
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/authResultReceiver.h
     ${CMAKE_CURRENT_SOURCE_DIR}/protocols/android_vpnprotocol.h
 )
@@ -35,7 +35,7 @@ set(HEADERS ${HEADERS}
 set(SOURCES ${SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_controller.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_notificationhandler.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidutils.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_utils.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/authResultReceiver.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/protocols/android_vpnprotocol.cpp
 )

client/platforms/android/android_controller.cpp

@@ -1,9 +1,10 @@
-#include <QCoreApplication>
 #include <QJniEnvironment>
 #include <QJsonDocument>
 #include <QQmlFile>
+#include <QEventLoop>
 
 #include "android_controller.h"
+#include "android_utils.h"
 #include "ui/controllers/importController.h"
 
 namespace
@@ -129,7 +130,7 @@ auto AndroidController::callActivityMethod(const char *methodName, const char *s
                                            const std::function<Ret()> &defValue, Args &&...args)
 {
     qDebug() << "Call activity method:" << methodName;
-    QJniObject activity = QNativeInterface::QAndroidApplication::context();
+    QJniObject activity = AndroidUtils::getActivity();
     if (activity.isValid()) {
         return activity.callMethod<Ret>(methodName, signature, std::forward<Args>(args)...);
     } else {
@@ -309,32 +310,15 @@ void AndroidController::onFileOpened(JNIEnv *env, jobject thiz, jstring uri)
 {
     Q_UNUSED(thiz);
 
-    const char *buffer = env->GetStringUTFChars(uri, nullptr);
+    emit AndroidController::instance()->fileOpened(AndroidUtils::convertJString(env, uri));
-    if (!buffer) {
-        return;
-    }
-
-    QString lUri(buffer);
-    env->ReleaseStringUTFChars(uri, buffer);
-
-    emit AndroidController::instance()->fileOpened(lUri);
 }
 
 // static
 void AndroidController::onConfigImported(JNIEnv *env, jobject thiz, jstring data)
 {
-    Q_UNUSED(env);
     Q_UNUSED(thiz);
 
-    const char *buffer = env->GetStringUTFChars(data, nullptr);
+    emit AndroidController::instance()->configImported(AndroidUtils::convertJString(env, data));
-    if (!buffer) {
-        return;
-    }
-
-    QString config(buffer);
-    env->ReleaseStringUTFChars(data, buffer);
-
-    emit AndroidController::instance()->configImported(config);
 }
 
 // static
@@ -342,12 +326,5 @@ bool AndroidController::decodeQrCode(JNIEnv *env, jobject thiz, jstring data)
 {
     Q_UNUSED(thiz);
 
-    const char *buffer = env->GetStringUTFChars(data, nullptr);
+    return ImportController::decodeQrCode(AndroidUtils::convertJString(env, data));
-    if (!buffer) {
-        return false;
-    }
-
-    QString code(buffer);
-    env->ReleaseStringUTFChars(data, buffer);
-    return ImportController::decodeQrCode(code);
 }

client/platforms/android/android_controller.h

@@ -18,7 +18,8 @@ public:
     bool initialize();
 
     // keep synchronized with org.amnezia.vpn.protocol.ProtocolState
-    enum class ConnectionState {
+    enum class ConnectionState
+    {
         CONNECTED,
         CONNECTING,
         DISCONNECTED,
@@ -30,7 +31,7 @@ public:
     ErrorCode start(const QJsonObject &vpnConfig);
     void stop();
     void setNotificationText(const QString &title, const QString &message, int timerSec);
-    void saveFile(const QString& fileName, const QString &data);
+    void saveFile(const QString &fileName, const QString &data);
     QString openFile(const QString &filter);
     void startQrReaderActivity();
 

client/platforms/android/android_utils.cpp

@@ -0,0 +1,30 @@
+#include <QCoreApplication>
+#include "android_utils.h"
+
+namespace AndroidUtils
+{
+
+QJniObject getActivity()
+{
+    return QNativeInterface::QAndroidApplication::context();
+}
+
+QString convertJString(JNIEnv *env, jstring data)
+{
+    int len = env->GetStringLength(data);
+    QString res(len, Qt::Uninitialized);
+    env->GetStringRegion(data, 0, len, reinterpret_cast<jchar *>(res.data()));
+    return res;
+}
+
+void runOnAndroidThreadSync(const std::function<void()> &runnable)
+{
+    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable).waitForFinished();
+}
+
+void runOnAndroidThreadAsync(const std::function<void()> &runnable)
+{
+    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable);
+}
+
+}

client/platforms/android/android_utils.h

@@ -0,0 +1,16 @@
+#ifndef ANDROID_UTILS_H
+#define ANDROID_UTILS_H
+
+#include <QJniObject>
+
+namespace AndroidUtils
+{
+QJniObject getActivity();
+
+QString convertJString(JNIEnv *env, jstring data);
+
+void runOnAndroidThreadSync(const std::function<void()> &runnable);
+void runOnAndroidThreadAsync(const std::function<void()> &runnable);
+};
+
+#endif // ANDROID_UTILS_H

client/platforms/android/androidutils.cpp

@@ -1,183 +0,0 @@
-/* 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 <QGuiApplication>
-#include <QJniEnvironment>
-#include <QJniObject>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QNetworkCookieJar>
-#include <QTimer>
-#include <QUrlQuery>
-
-#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;
-}

client/platforms/android/androidutils.h

@@ -1,49 +0,0 @@
-/* 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

client/ui/controllers/exportController.cpp

@@ -15,7 +15,7 @@
 #include "core/errorstrings.h"
 #include "systemController.h"
 #ifdef Q_OS_ANDROID
-    #include "platforms/android/androidutils.h"
+    #include "platforms/android/android_utils.h"
 #endif
 #include "qrcodegen.hpp"
 

client/ui/controllers/pageController.cpp

@@ -7,7 +7,7 @@
 #endif
 
 #ifdef Q_OS_ANDROID
-    #include "../../platforms/android/androidutils.h"
+    #include "platforms/android/android_utils.h"
     #include <QJniObject>
 #endif
 #if defined Q_OS_MAC

client/ui/controllers/settingsController.cpp

@@ -7,8 +7,7 @@
 #include "ui/qautostart.h"
 #include "version.h"
 #ifdef Q_OS_ANDROID
-    #include "../../platforms/android/android_controller.h"
+    #include "platforms/android/android_utils.h"
-    #include "../../platforms/android/androidutils.h"
     #include <QJniObject>
 #endif