Fix in AndroidController [NO CI]

* Icon for macos and tiny fixes
* Macos deploy build fix

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 3.0.7.2
+project(${PROJECT} VERSION 3.0.7.4
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )

client/CMakeLists.txt

@@ -214,7 +214,11 @@ if(APPLE)
 
         set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
         add_compile_definitions(MVPN_MACOS)
-        # ICON   = $$PWD/images/app.icns
+
+        set(ICON_FILE ${CMAKE_CURRENT_SOURCE_DIR}/images/app.icns)
+        set(MACOSX_BUNDLE_ICON_FILE app.icns)
+        set_source_files_properties(${ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+        set(SOURCES ${SOURCES} ${ICON_FILE})
 
         find_library(FW_COCOA Cocoa)
         find_library(FW_APPLICATIONSERVICES ApplicationServices)

client/android/build.gradle

@@ -136,9 +136,9 @@ android {
     defaultConfig {
         resConfig "en"
         minSdkVersion = 24
-        targetSdkVersion = 31
-        versionCode 10 // Change to a higher number
-        versionName "2.0.10" // Change to a higher number
+        targetSdkVersion = 34
+        versionCode 21 // Change to a higher number
+        versionName "3.0.7" // Change to a higher number
 
         javaCompileOptions.annotationProcessorOptions.arguments = [
             "room.schemaLocation": "${qtAndroidDir}/schemas".toString()

client/core/sshclient.cpp

@@ -257,7 +257,6 @@ namespace libssh {
                     int bytesWritten = sftp_write(file, buffer, bufferSize);
 
                     std::string chunk(buffer, bufferSize);
-                    qDebug() << "sftp write: " << QString(chunk.c_str());
 
                     if (bytesWritten != bufferSize) {
                         fin.close();
@@ -272,7 +271,6 @@ namespace libssh {
                     fin.read(buffer, lastChunkSize);
 
                     std::string chunk(buffer, lastChunkSize);
-                    qDebug() << "sftp write: " << QString(chunk.c_str());
 
                     int bytesWritten = sftp_write(file, buffer, lastChunkSize);
 

client/ui/pages_logic/ServerSettingsLogic.cpp

@@ -100,6 +100,11 @@ void ServerSettingsLogic::onLineEditDescriptionEditingFinished()
     uiLogic()->onUpdateAllPages();
 }
 
+bool ServerSettingsLogic::isCurrentServerHasCredentials()
+{
+    return m_settings->haveAuthData(uiLogic()->m_selectedServerIndex);
+}
+
 #if defined(Q_OS_ANDROID)
 /* Auth result handler for Android */
 void authResultReceiver::handleActivityResult(int receiverRequestCode, int resultCode, const QJniObject &data)

client/ui/pages_logic/ServerSettingsLogic.h

@@ -31,6 +31,8 @@ public:
     Q_INVOKABLE void onPushButtonClearClientCacheClicked();
     Q_INVOKABLE void onLineEditDescriptionEditingFinished();
 
+    Q_INVOKABLE bool isCurrentServerHasCredentials();
+
 public:
     explicit ServerSettingsLogic(UiLogic *uiLogic, QObject *parent = nullptr);
     ~ServerSettingsLogic() = default;

client/ui/pages_logic/StartPageLogic.h

@@ -23,7 +23,7 @@ class StartPageLogic : public PageLogicBase
     AUTO_PROPERTY(QString, labelWaitInfoText)
     AUTO_PROPERTY(bool, pushButtonBackFromStartVisible)
 
-    AUTO_PROPERTY(QString, privateKeyPassphrase);
+    AUTO_PROPERTY(QString, privateKeyPassphrase)
 
     READONLY_PROPERTY(QRegularExpression, ipAddressPortRegex)
 public:

client/ui/qml/Controls/PopupWithQuestion.qml

@@ -13,12 +13,18 @@ Popup {
 
     anchors.centerIn: Overlay.overlay
     modal: true
-    closePolicy: Popup.NoAutoClose
+    closePolicy: Popup.CloseOnEscape
 
     width: parent.width - 20
+    focus: true
+
+    onAboutToHide: {
+        parent.forceActiveFocus(true)
+    }
 
     ColumnLayout {
         width: parent.width
+
         Text {
             horizontalAlignment: Text.AlignHCenter
             Layout.fillWidth: true
@@ -28,9 +34,9 @@ Popup {
         }
 
         RowLayout {
+            Layout.fillWidth: true
             BlueButtonType {
                 id: yesButton
-                Layout.preferredWidth: parent.width / 2
                 Layout.fillWidth: true
                 text: yesText
                 onClicked: {
@@ -43,7 +49,6 @@ Popup {
             }
             BlueButtonType {
                 id: noButton
-                Layout.preferredWidth: parent.width / 2
                 Layout.fillWidth: true
                 text: noText
                 onClicked: {

client/ui/qml/Pages/PageServerSettings.qml

@@ -110,13 +110,18 @@ PageBase {
                 Layout.topMargin: 10
                 text: qsTr("Forget this server")
                 onClicked: {
+                    if (ServerSettingsLogic.isCurrentServerHasCredentials()) {
+                        popupForgetServer.questionText = "Attention! This action will not remove any data from the server, it will just remove server from the list. Continue?"
+                    }
+                    else {
+                        popupForgetServer.questionText = "Remove server from the list?"
+                    }
                     popupForgetServer.open()
                 }
             }
 
             PopupWithQuestion {
                 id: popupForgetServer
-                questionText: "Attention! This action will not remove the container on the server, it will only remove the container information from the application. Continue?"
                 yesFunc: function() {
                     ServerSettingsLogic.onPushButtonForgetServer()
                     close()

client/ui/qml/Pages/PageStart.qml

@@ -233,9 +233,8 @@ PageBase {
             anchors.top: label_server_ip.bottom
             anchors.horizontalCenter: parent.horizontalCenter
             text: StartPageLogic.lineEditIpText
-            onEditingFinished: {
-                StartPageLogic.lineEditIpText = text
-            }
+            onEditingFinished: { StartPageLogic.lineEditIpText = text }
+            onTextEdited: { StartPageLogic.lineEditIpText = text }
 
             validator: RegularExpressionValidator {
                 regularExpression: StartPageLogic.ipAddressPortRegex
@@ -253,9 +252,8 @@ PageBase {
             anchors.top: label_login.bottom
             anchors.horizontalCenter: parent.horizontalCenter
             text: StartPageLogic.lineEditLoginText
-            onEditingFinished: {
-                StartPageLogic.lineEditLoginText = text
-            }
+            onEditingFinished: { StartPageLogic.lineEditLoginText = text }
+            onTextEdited: { StartPageLogic.lineEditLoginText = text }
         }
 
         LabelType {
@@ -268,25 +266,29 @@ PageBase {
             id: new_server_password
             anchors.top: label_new_server_password.bottom
             anchors.horizontalCenter: parent.horizontalCenter
+
+            inputMethodHints: Qt.ImhSensitiveData
             echoMode: TextInput.Password
             text: StartPageLogic.lineEditPasswordText
-            onEditingFinished: {
-                StartPageLogic.lineEditPasswordText = text
-            }
+            onEditingFinished: { StartPageLogic.lineEditPasswordText = text }
+            onTextEdited: { StartPageLogic.lineEditPasswordText = text }
+            onAccepted: { StartPageLogic.onPushButtonConnect() }
         }
         TextFieldType {
             id: new_server_ssh_key
             anchors.top: label_new_server_password.bottom
             anchors.horizontalCenter: parent.horizontalCenter
 
+            visible: false
             height: 71
             font.pixelSize: 10
             verticalAlignment: Text.AlignTop
+            inputMethodHints: Qt.ImhSensitiveData
+
             text: StartPageLogic.textEditSshKeyText
-            onEditingFinished: {
-                StartPageLogic.textEditSshKeyText = text
-            }
-            visible: false
+            onEditingFinished: { StartPageLogic.textEditSshKeyText = text }
+            onTextEdited: { StartPageLogic.textEditSshKeyText = text }
+            onAccepted: { StartPageLogic.onPushButtonConnect() }
         }
 
         LabelType {

client/ui/qml/main.qml

@@ -354,7 +354,7 @@ Window  {
                 }
                 textArea.wrapMode: cbLogWrap.checked ? TextEdit.WordWrap: TextEdit.NoWrap
 
-                Keys.onPressed: {
+                Keys.onPressed: function(event) {
                     UiLogic.keyPressEvent(event.key)
                     event.accepted = true
                 }

client/ui/uilogic.cpp

@@ -133,13 +133,13 @@ void UiLogic::initializeUiLogic()
     connect(AndroidController::instance(), &AndroidController::initialized, [this](bool status, bool connected, const QDateTime& connectionDate) {
         if (connected) {
             pageLogic<VpnLogic>()->onConnectionStateChanged(VpnProtocol::Connected);
-            m_vpnConnection->restoreConnection();
+            if (m_vpnConnection) m_vpnConnection->restoreConnection();
         }
     });
     if (!AndroidController::instance()->initialize(pageLogic<StartPageLogic>())) {
-         qCritical() << QString("Init failed") ;
-         emit VpnProtocol::Error;
-         return;
+        qCritical() << QString("Init failed");
+        if (m_vpnConnection) m_vpnConnection->connectionStateChanged(VpnProtocol::Error);
+        return;
     }
 #endif
 

deploy/build_macos.sh

@@ -66,11 +66,9 @@ echo "____________________________________"
 echo "............Deploy.................."
 echo "____________________________________"
 
-# Package 
+# Package
 echo "Packaging ..."
 
-#cd $DEPLOY_DIR
-
 $QT_BIN_DIR/macdeployqt $OUT_APP_DIR/$APP_FILENAME -always-overwrite -qmldir=$PROJECT_DIR
 cp -av $BUILD_DIR/service/server/$APP_NAME-service $BUNDLE_DIR/Contents/macOS
 cp -Rv $PROJECT_DIR/deploy/data/macos/* $BUNDLE_DIR/Contents/macOS
@@ -147,7 +145,7 @@ if [ "${MAC_CERT_PW+x}" ]; then
 fi
 
 echo "Building DMG installer..."
-hdiutil create -volname $APP_NAME -srcfolder $BUILD_DIR/installer/$APP_NAME.app -ov -format UDZO $DMG_FILENAME
+hdiutil create -volname Amnezia -srcfolder $BUILD_DIR/installer/$APP_NAME.app -ov -format UDZO $DMG_FILENAME
 
 if [ "${MAC_CERT_PW+x}" ]; then
   echo "Signing DMG installer..."

service/CMakeLists.txt

@@ -7,10 +7,6 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(NOT IOS AND NOT ANDROID)
-    #include(common.cmake)
-#if (qtservice-uselib)
-#    add_subdirectory(buildlib)
-#endif()
     add_subdirectory(server)
 endif()
 

service/server/CMakeLists.txt

@@ -94,11 +94,16 @@ include_directories(
 add_executable(${PROJECT} ${SOURCES} ${HEADERS})
 target_link_libraries(${PROJECT} PRIVATE Qt6::Core Qt6::Network Qt6::RemoteObjects Qt6::Core5Compat ${LIBS})
 
-qt_add_repc_sources(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipc_interface.rep)
-if(NOT IOS)
-    qt_add_repc_sources(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipc_process_interface.rep)
+if(APPLE)
+    set_target_properties(${PROJECT} PROPERTIES
+        INSTALL_RPATH "@executable_path/../Frameworks"
+        BUILD_WITH_INSTALL_RPATH TRUE
+    )
 endif()
 
+qt_add_repc_sources(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipc_interface.rep)
+qt_add_repc_sources(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipc_process_interface.rep)
+
 # deploy artifacts required to run the application to the debug build folder
 if(WIN32)
     if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
@@ -112,12 +117,10 @@ elseif(APPLE AND NOT IOS)
     set(DEPLOY_ARTIFACT_PATH "macos")
 endif()
 
-if(NOT IOS AND NOT ANDROID)
-    add_custom_command(
-        TARGET ${PROJECT} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_directory,true>
-        ${CMAKE_SOURCE_DIR}/deploy/data/${DEPLOY_ARTIFACT_PATH}
-        $<TARGET_FILE_DIR:${PROJECT}>
-        COMMAND_EXPAND_LISTS
-    )
-endif()
+add_custom_command(
+    TARGET ${PROJECT} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_directory,true>
+    ${CMAKE_SOURCE_DIR}/deploy/data/${DEPLOY_ARTIFACT_PATH}
+    $<TARGET_FILE_DIR:${PROJECT}>
+    COMMAND_EXPAND_LISTS
+)