From 4a4c9cd63fecd1c0ddaab3441ea41bfc18fae3ab Mon Sep 17 00:00:00 2001 From: Mazay B Date: Fri, 30 Jun 2023 00:21:56 +0100 Subject: [PATCH 1/2] Build fixes and some refactoring --- .../android/src/org/amnezia/vpn/VPNService.kt | 7 +--- .../src/org/amnezia/vpn/VPNServiceBinder.kt | 1 + .../org/ftylitak/qzxing/NativeFunctions.java | 6 --- .../ftylitak/qzxing/QZXingLiveActivity.java | 25 ----------- .../src/org/ftylitak/qzxing/Utilities.java | 42 ------------------- client/main.cpp | 1 + .../platforms/android/android_controller.cpp | 3 -- client/platforms/android/androidvpnactivity.h | 1 + client/ui/qml/main.qml | 30 +++++++------ 9 files changed, 22 insertions(+), 94 deletions(-) delete mode 100644 client/android/src/org/ftylitak/qzxing/NativeFunctions.java delete mode 100644 client/android/src/org/ftylitak/qzxing/QZXingLiveActivity.java delete mode 100644 client/android/src/org/ftylitak/qzxing/Utilities.java diff --git a/client/android/src/org/amnezia/vpn/VPNService.kt b/client/android/src/org/amnezia/vpn/VPNService.kt index 8f6966ef..570a487b 100644 --- a/client/android/src/org/amnezia/vpn/VPNService.kt +++ b/client/android/src/org/amnezia/vpn/VPNService.kt @@ -168,11 +168,8 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface { } override fun onCreate() { - super.onCreate() -// Log.v(tag, "Aman: onCreate....................") -// Log.v(tag, "Aman: onCreate....................") -// Log.v(tag, "Aman: onCreate....................") -// NotificationUtil.show(this) // Go foreground + super.onCreate() + NotificationUtil.show(this) // Go foreground } override fun onUnbind(intent: Intent?): Boolean { diff --git a/client/android/src/org/amnezia/vpn/VPNServiceBinder.kt b/client/android/src/org/amnezia/vpn/VPNServiceBinder.kt index d3193fba..531a3df1 100644 --- a/client/android/src/org/amnezia/vpn/VPNServiceBinder.kt +++ b/client/android/src/org/amnezia/vpn/VPNServiceBinder.kt @@ -196,6 +196,7 @@ class VPNServiceBinder(service: VPNService) : Binder() { /** * The codes we Are Using in case of [dispatchEvent] + * Qt codes in the androidvpnactivity.h */ object EVENTS { const val init = 0 diff --git a/client/android/src/org/ftylitak/qzxing/NativeFunctions.java b/client/android/src/org/ftylitak/qzxing/NativeFunctions.java deleted file mode 100644 index 487fc656..00000000 --- a/client/android/src/org/ftylitak/qzxing/NativeFunctions.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.ftylitak.qzxing; - -public class NativeFunctions { - public static native void onPermissionsGranted(); - public static native void onPermissionsDenied(); -} diff --git a/client/android/src/org/ftylitak/qzxing/QZXingLiveActivity.java b/client/android/src/org/ftylitak/qzxing/QZXingLiveActivity.java deleted file mode 100644 index b6a4649d..00000000 --- a/client/android/src/org/ftylitak/qzxing/QZXingLiveActivity.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.ftylitak.qzxing; - -import android.Manifest; -import android.content.pm.PackageManager; -import org.qtproject.qt.android.bindings.QtActivity; -import static org.ftylitak.qzxing.Utilities.REQUEST_CAMERA; - -public class QZXingLiveActivity extends QtActivity { - @Override - public void onRequestPermissionsResult(int requestCode, - String permissions[], int[] grantResults) { - switch (requestCode) { - case REQUEST_CAMERA: { - // If request is cancelled, the result arrays are empty. - if (grantResults.length > 0 - && grantResults[0] == PackageManager.PERMISSION_GRANTED) { - NativeFunctions.onPermissionsGranted(); - } else { - NativeFunctions.onPermissionsDenied(); - } - return; - } - } - } -} diff --git a/client/android/src/org/ftylitak/qzxing/Utilities.java b/client/android/src/org/ftylitak/qzxing/Utilities.java deleted file mode 100644 index ced994b9..00000000 --- a/client/android/src/org/ftylitak/qzxing/Utilities.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ftylitak.qzxing; - -import android.Manifest; -import android.app.Activity; -import android.content.pm.PackageManager; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; - -import java.util.ArrayList; - -public class Utilities { - - public static final int REQUEST_CAMERA = 0; - - public static final String[] requiredPermissionsModifyPhoneState = { - Manifest.permission.CAMERA, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - }; - - public static void checkAndRequestPermissionList(Activity activity, String[] permissions) { - ArrayList permissionsToRequest = new ArrayList<>(); - for (int i = 0; i < permissions.length; i++) { - if (ContextCompat.checkSelfPermission(activity, permissions[i]) - != PackageManager.PERMISSION_GRANTED) - permissionsToRequest.add(permissions[i]); - } - - if (permissionsToRequest.size() != 0) - ActivityCompat.requestPermissions(activity, - permissionsToRequest.toArray(new String[0]), - REQUEST_CAMERA); - else - NativeFunctions.onPermissionsGranted(); - } - - public static void requestQZXingPermissions(Activity activity) { - checkAndRequestPermissionList(activity, requiredPermissionsModifyPhoneState); - } - - -} diff --git a/client/main.cpp b/client/main.cpp index 8f1a8f75..2621cce6 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -1,4 +1,5 @@ #include +#include #include "amnezia_application.h" #include "version.h" diff --git a/client/platforms/android/android_controller.cpp b/client/platforms/android/android_controller.cpp index 81b04b8a..18955532 100644 --- a/client/platforms/android/android_controller.cpp +++ b/client/platforms/android/android_controller.cpp @@ -91,7 +91,6 @@ AndroidController::AndroidController() : QObject() connect(activity, &AndroidVPNActivity::eventStatisticUpdate, this, [this](const QString& parcelBody) { - qDebug() << "Transact: update"; auto doc = QJsonDocument::fromJson(parcelBody.toUtf8()); QString rx = doc.object()["rx_bytes"].toString(); @@ -229,8 +228,6 @@ void AndroidController::setFallbackConnectedNotification() { } void AndroidController::checkStatus() { - qDebug() << "check status"; - AndroidVPNActivity::sendToService(ServiceAction::ACTION_REQUEST_STATISTIC, QString()); } diff --git a/client/platforms/android/androidvpnactivity.h b/client/platforms/android/androidvpnactivity.h index db128b1b..c485f4e5 100644 --- a/client/platforms/android/androidvpnactivity.h +++ b/client/platforms/android/androidvpnactivity.h @@ -39,6 +39,7 @@ enum ServiceAction { typedef enum ServiceAction ServiceAction; // Event Types that will be Dispatched after registration +// Kotlin codes in the VPNServiceBinder.kt enum ServiceEvents { // The Service has Accepted our Binder // Responds with the current status of the vpn. diff --git a/client/ui/qml/main.qml b/client/ui/qml/main.qml index 8dc5adca..4e20cac4 100644 --- a/client/ui/qml/main.qml +++ b/client/ui/qml/main.qml @@ -1,13 +1,17 @@ +import QtCore import QtQuick -import QtQuick.Window import QtQuick.Controls +import QtQuick.Controls.Basic +import QtQuick.Dialogs import QtQuick.Layouts +import QtQuick.Window + +import Qt.labs.platform as LabsPlatform +import Qt.labs.folderlistmodel as LabsFolderlistmodel + import PageEnum 1.0 import PageType 1.0 -import Qt.labs.platform -import Qt.labs.folderlistmodel -import QtQuick.Dialogs -import QtQuick.Controls.Basic + import "Controls" import "Pages" import "Pages/Protocols" @@ -117,13 +121,13 @@ Window { } } - FolderListModel { + LabsFolderlistmodel.FolderListModel { id: folderModelPages folder: "qrc:/ui/qml/Pages/" nameFilters: ["*.qml"] showDirs: false - onStatusChanged: if (status == FolderListModel.Ready) { + onStatusChanged: if (status == LabsFolderlistmodel.FolderListModel.Ready) { for (var i=0; i Date: Thu, 29 Jun 2023 17:38:04 -0700 Subject: [PATCH 2/2] Github actions fixes --- .github/workflows/deploy.yml | 16 ++++++++-------- deploy/build_macos.sh | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e5cea7a3..cf8553fc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,8 +9,8 @@ jobs: runs-on: ubuntu-latest env: - QT_VERSION: 6.5.0 - QIF_VERSION: 4.5 + QT_VERSION: 6.5.1 + QIF_VERSION: 4.6 steps: - name: 'Install Qt' @@ -63,8 +63,8 @@ jobs: runs-on: windows-latest env: - QT_VERSION: 6.5.0 - QIF_VERSION: 4.5 + QT_VERSION: 6.5.1 + QIF_VERSION: 4.6 BUILD_ARCH: 64 steps: @@ -124,7 +124,7 @@ jobs: runs-on: macos-latest env: - QT_VERSION: 6.5.0 + QT_VERSION: 6.5.1 steps: - name: 'Setup xcode' @@ -199,8 +199,8 @@ jobs: runs-on: macos-latest env: - QT_VERSION: 6.5.0 - QIF_VERSION: 4.5 + QT_VERSION: 6.5.1 + QIF_VERSION: 4.6 steps: - name: 'Setup xcode' @@ -262,7 +262,7 @@ jobs: arch: ['android_x86_64', 'android_x86'] #, 'android_armv7', 'android_arm64_v8a'] env: - QT_VERSION: 6.5.0 + QT_VERSION: 6.5.1 steps: - name: 'Install desktop Qt' diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 7e58db41..1a163ae1 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -38,8 +38,8 @@ DMG_FILENAME=$PROJECT_DIR/${APP_NAME}.dmg # Search Qt if [ -z "${QT_VERSION+x}" ]; then -QT_VERSION=6.4.1; -QIF_VERSION=4.1 +QT_VERSION=6.5.1; +QIF_VERSION=4.6 QT_BIN_DIR=$HOME/Qt/$QT_VERSION/macos/bin QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin fi