chore: fix android build

client/CMakeLists.txt

@@ -11,9 +11,13 @@ set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Autogen")
 set(PACKAGES
     Core Gui Network Xml
     RemoteObjects Quick Svg QuickControls2
-    Core5Compat Concurrent LinguistTools HttpServer
+    Core5Compat Concurrent LinguistTools
 )
 
+if(NOT ANDROID AND NOT IOS)
+    list(APPEND PACKAGES HttpServer)
+endif()
+
 execute_process(
   WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
   COMMAND git rev-parse --short HEAD
@@ -43,9 +47,13 @@ set(LIBS ${LIBS}
     Qt6::Core Qt6::Gui
     Qt6::Network Qt6::Xml Qt6::RemoteObjects
     Qt6::Quick Qt6::Svg Qt6::QuickControls2
-    Qt6::Core5Compat Qt6::Concurrent Qt6::HttpServer
+    Qt6::Core5Compat Qt6::Concurrent
 )
 
+if(NOT ANDROID AND NOT IOS)
+    list(APPEND LIBS Qt6::HttpServer)
+endif()
+
 if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
     set(LIBS ${LIBS} Qt6::Widgets)
 endif()

client/cmake/sources.cmake

@@ -124,8 +124,10 @@ file(GLOB_RECURSE PAGE_LOGIC_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/ui/pages_l
 file(GLOB CONFIGURATORS_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/configurators/*.h)
 file(GLOB CONFIGURATORS_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/configurators/*.cpp)
 
-file(GLOB LOCAL_PROXY_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/local-proxy/*.h)
-file(GLOB LOCAL_PROXY_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/local-proxy/*.cpp)
+if(NOT ANDROID AND NOT IOS)
+    file(GLOB LOCAL_PROXY_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/local-proxy/*.h)
+    file(GLOB LOCAL_PROXY_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/local-proxy/*.cpp)
+endif()
 
 file(GLOB UI_MODELS_H CONFIGURE_DEPENDS
     ${CLIENT_ROOT_DIR}/ui/models/*.h
@@ -155,7 +157,6 @@ set(HEADERS ${HEADERS}
     ${CONFIGURATORS_H}
     ${UI_MODELS_H}
     ${UI_CONTROLLERS_H}
-    ${LOCAL_PROXY_H}
 )
 set(SOURCES ${SOURCES}
     ${COMMON_FILES_CPP}
@@ -163,9 +164,13 @@ set(SOURCES ${SOURCES}
     ${CONFIGURATORS_CPP}
     ${UI_MODELS_CPP}
     ${UI_CONTROLLERS_CPP}
-    ${LOCAL_PROXY_CPP}
 )
 
+if(NOT ANDROID AND NOT IOS)
+    list(APPEND HEADERS ${LOCAL_PROXY_H})
+    list(APPEND SOURCES ${LOCAL_PROXY_CPP})
+endif()
+
 if(WIN32)
     set(HEADERS ${HEADERS}
         ${CLIENT_ROOT_DIR}/protocols/ikev2_vpn_protocol_windows.h

client/ui/controllers/settingsController.cpp

@@ -531,6 +531,15 @@ void SettingsController::disableHomeAdLabel()
     emit isHomeAdLabelVisibleChanged(false);
 }
 
+bool SettingsController::isLocalProxySupported() const
+{
+#ifdef AMNEZIA_DESKTOP
+    return true;
+#else
+    return false;
+#endif
+}
+
 bool SettingsController::isLocalProxyHttpEnabled() const
 {
     return m_settings->isLocalProxyHttpEnabled();

client/ui/controllers/settingsController.h

@@ -36,6 +36,7 @@ public:
     Q_PROPERTY(int safeAreaTopMargin READ getSafeAreaTopMargin NOTIFY safeAreaTopMarginChanged)
     Q_PROPERTY(int safeAreaBottomMargin READ getSafeAreaBottomMargin NOTIFY safeAreaBottomMarginChanged)
     Q_PROPERTY(int imeHeight READ getImeHeight NOTIFY imeHeightChanged)
+    Q_PROPERTY(bool isLocalProxySupported READ isLocalProxySupported CONSTANT)
     Q_PROPERTY(bool isLocalProxyHttpEnabled READ isLocalProxyHttpEnabled NOTIFY localProxySettingsUpdated)
     Q_PROPERTY(int localProxyPort READ localProxyPort WRITE setLocalProxyPort NOTIFY localProxySettingsUpdated)
     Q_PROPERTY(QString localProxyOwnerUuid READ localProxyOwnerUuid NOTIFY localProxySettingsUpdated)
@@ -112,6 +113,7 @@ public slots:
     bool isHomeAdLabelVisible();
     void disableHomeAdLabel();
 
+    bool isLocalProxySupported() const;
     bool isLocalProxyHttpEnabled() const;
     int localProxyPort() const;
     QString localProxyOwnerUuid() const;

client/ui/qml/Pages2/PageSettingsApiServerInfo.qml

@@ -180,7 +180,9 @@ PageType {
                 Layout.fillWidth: true
                 Layout.topMargin: warning.visible ? 16 : 32
                 text: qsTr("Connection")
-                descriptionText: qsTr("Protocol selection and local proxy setup")
+                descriptionText: SettingsController.isLocalProxySupported
+                                  ? qsTr("Protocol selection and local proxy setup")
+                                  : qsTr("Protocol selection")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {

client/ui/qml/Pages2/PageSettingsConnectionType.qml

@@ -76,6 +76,8 @@ PageType {
                 Layout.fillWidth: true
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
+                visible: SettingsController.isLocalProxySupported
+                Layout.preferredHeight: visible ? implicitHeight : 0
 
                 text: qsTr("Local proxy")
                 descriptionText: SettingsController.isLocalProxyHttpEnabled ? qsTr("Running: 127.0.0.1:%1").arg(SettingsController.localProxyPort || 0)
@@ -87,7 +89,10 @@ PageType {
                 }
             }
 
-            DividerType {}
+            DividerType {
+                visible: SettingsController.isLocalProxySupported
+                Layout.preferredHeight: visible ? implicitHeight : 0
+            }
         }
     }
 }