VPN connectivity fix on network change

Build fixes and some refactoring

.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'
@@ -257,12 +257,8 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
 
-    strategy:
-      matrix:
-        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'
@@ -284,7 +280,7 @@ jobs:
         version: ${{ env.QT_VERSION }}
         host: 'linux'
         target: 'android'
-        arch: ${{ matrix.arch }}
+        arch: 'android_x86_64'
         modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
         dir: ${{ runner.temp }}
         setup-python: 'true'
@@ -318,12 +314,12 @@ jobs:
         export ANDROID_NDK_PLATFORM=android-23
         export ANDROID_NDK_HOME=${{ runner.temp }}/android-ndk-r${NDK_VERSION}
         export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
-        export ANDROID_CURRENT_ARCH=${{ matrix.arch }}
+        export ANDROID_CURRENT_ARCH=android_x86_64
 
         if [ ! -f $ANDROID_NDK_ROOT/ndk-build ]; then 
           wget https://dl.google.com/android/repository/android-ndk-r${NDK_VERSION}-linux.zip -qO ${{ runner.temp }}/ndk.zip &&
           unzip -q -d ${{ runner.temp }} ${{ runner.temp }}/ndk.zip ; 
         fi
 
-        export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/${{ matrix.arch }}/bin
+        export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android_x86_64/bin
         bash deploy/build_android.sh

.gitmodules

@@ -58,3 +58,6 @@
 [submodule "client/3rd/mbedtls"]
 	path = client/3rd/mbedtls
 	url = https://github.com/Mbed-TLS/mbedtls.git
+[submodule "client/3rd-prebuilt"]
+	path = client/3rd-prebuilt
+	url = https://github.com/amnezia-vpn/3rd-prebuilt

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.5
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )

README.md

@@ -4,14 +4,22 @@
 [![Build Status](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml/badge.svg?branch=dev)](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml?query=branch:dev)
 [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/amnezia-vpn/amnezia-client)
 
-Amnezia is a VPN client with the key feature of deploying your own VPN server on you virtual server.
+Amnezia is an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server.
 
 ## Features
-- Very easy to use - enter your ip address, ssh login and password, and Amnezia client will automatically install VPN docker containers to your server and connect to VPN.
+- Very easy to use - enter your ip address, ssh login and password, and Amnezia will automatically install VPN docker containers to your server and connect to VPN.
 - OpenVPN, ShadowSocks, WireGuard, IKEv2 protocols support.
+- Masking VPN with OpenVPN over Cloak plugin
 - Split tunneling support - add any sites to client to enable VPN only for them (only for desktops)
 - Windows, MacOS, Linux, Android, iOS releases.
 
+## Links
+[https://amnezia.org](https://amnezia.org) - project website  
+[https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
+[https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Telegram support channel (English)  
+[https://t.me/amnezia_vpn](https://t.me/amnezia_vpn) - Telegram support channel (Russian)  
+[https://signal.group/...](https://signal.group/#CjQKIB2gUf8QH_IXnOJMGQWMDjYz9cNfmRQipGWLFiIgc4MwEhAKBONrSiWHvoUFbbD0xwdh) - Signal channel  
+
 ## Tech
 
 AmneziaVPN uses a number of open source projects to work:
@@ -121,12 +129,6 @@ You may face compiling issues in QT Creator after you've worked in Android Studi
 ## License
 GPL v.3
 
-## Contacts
-[https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Telegram support channel (English)  
-[https://t.me/amnezia_vpn](https://t.me/amnezia_vpn) - Telegram support channel (Russian)  
-[https://signal.group/...](https://signal.group/#CjQKIB2gUf8QH_IXnOJMGQWMDjYz9cNfmRQipGWLFiIgc4MwEhAKBONrSiWHvoUFbbD0xwdh) - Signal channel  
-[https://amnezia.org](https://amnezia.org) - project website  
-
 ## Donate
 Bitcoin: bc1qn9rhsffuxwnhcuuu4qzrwp4upkrq94xnh8r26u  
 XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3  

client/3rd/OpenSSL/lib/android

@@ -0,0 +1 @@
+../../../../client/3rd-prebuilt/3rd-prebuilt/openssl/android

client/3rd/OpenSSL/lib/linux

@@ -0,0 +1 @@
+../../../../client/3rd-prebuilt/3rd-prebuilt/openssl/linux

client/3rd/OpenSSL/lib/windows

@@ -0,0 +1 @@
+../../../../client/3rd-prebuilt/3rd-prebuilt/openssl/windows

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)
@@ -490,7 +494,6 @@ if(ANDROID)
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/AmneziaApp.kt
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/PackageManagerHelper.java
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/VPNActivity.kt
-            ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/VPNApplication.java
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/VPNClientBinder.kt
             ${CMAKE_CURRENT_LIST_DIR}/android/src/org/amnezia/vpn/qt/VPNPermissionHelper.kt
             ${CMAKE_CURRENT_BINARY_DIR}
@@ -513,7 +516,14 @@ if(ANDROID)
             ${CMAKE_CURRENT_LIST_DIR}/android/lib/wireguard/${abi}/libwg.so
             ${CMAKE_CURRENT_LIST_DIR}/android/lib/wireguard/${abi}/libwg-go.so
             ${CMAKE_CURRENT_LIST_DIR}/android/lib/wireguard/${abi}/libwg-quick.so
+            ${CMAKE_CURRENT_LIST_DIR}/android/lib/openvpn/${abi}/libck-ovpn-plugin.so
+            ${CMAKE_CURRENT_LIST_DIR}/android/lib/openvpn/${abi}/libopenvpn.so
+            ${CMAKE_CURRENT_LIST_DIR}/android/lib/openvpn/${abi}/libovpn3.so
+            ${CMAKE_CURRENT_LIST_DIR}/android/lib/openvpn/${abi}/libovpnexec.so
+            ${CMAKE_CURRENT_LIST_DIR}/android/lib/openvpn/${abi}/libovpnutil.so
+            ${CMAKE_CURRENT_LIST_DIR}/android/lib/openvpn/${abi}/librsapss.so  
         )
+        
     endforeach()
 
 endif()

client/amnezia_application.cpp

@@ -1,7 +1,10 @@
 #include "amnezia_application.h"
 
+#include <QClipboard>
 #include <QFontDatabase>
+#include <QMimeData>
 #include <QStandardPaths>
+#include <QTextDocument>
 #include <QTimer>
 #include <QTranslator>
 
@@ -51,7 +54,7 @@
     setQuitOnLastWindowClosed(false);
 
     // Fix config file permissions
-#ifdef Q_OS_LINUX
+#ifdef Q_OS_LINUX && !defined(Q_OS_ANDROID)
     {
         QSettings s(ORGANIZATION_NAME, APPLICATION_NAME);
         s.setValue("permFixed", true);
@@ -64,7 +67,6 @@
     QString configLoc2 = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/"
             + ORGANIZATION_NAME + "/" + APPLICATION_NAME + "/" + APPLICATION_NAME + ".conf";
     QFile::setPermissions(configLoc2, QFileDevice::ReadOwner | QFileDevice::WriteOwner);
-
 #endif
 
     m_settings = std::shared_ptr<Settings>(new Settings);
@@ -135,6 +137,19 @@ void AmneziaApplication::init()
     }
 #endif
 
+// Android TextField clipboard workaround
+// https://bugreports.qt.io/browse/QTBUG-113461
+#ifdef Q_OS_ANDROID
+    QObject::connect(qApp, &QApplication::applicationStateChanged, [](Qt::ApplicationState state) {
+        if (state == Qt::ApplicationActive) {
+            if (qApp->clipboard()->mimeData()->formats().contains("text/html")) {
+                QTextDocument doc;
+                doc.setHtml(qApp->clipboard()->mimeData()->html());
+                qApp->clipboard()->setText(doc.toPlainText());
+            }
+        }
+    });
+#endif
 }
 
 void AmneziaApplication::registerTypes()

client/android/build.gradle

@@ -19,6 +19,7 @@ buildscript {
         google()
         jcenter()
         mavenCentral()
+        maven { url = uri("https://jitpack.io") }
     }
 
     dependencies {
@@ -136,9 +137,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 22 // Change to a higher number
+        versionName "3.0.7" // Change to a higher number
 
         javaCompileOptions.annotationProcessorOptions.arguments = [
             "room.schemaLocation": "${qtAndroidDir}/schemas".toString()
@@ -173,18 +174,6 @@ android {
        }
    }
 
-//   externalNativeBuild {
-//       cmake {
-//           path 'wireguard/CMakeLists.txt'
-//       }
-//   }
-
-    externalNativeBuild {
-        cmake {
-            version cmakeMinVersion
-            path "${projectDir}/cpp/CMakeLists.txt"
-        }
-    }
 }
 
 

client/android/lib/openvpn

@@ -0,0 +1 @@
+../../3rd-prebuilt/3rd-prebuilt/openvpn/android

client/android/lib/wireguard

@@ -0,0 +1 @@
+../../../client/3rd-prebuilt/3rd-prebuilt/wireguard/android

client/android/settings.gradle

@@ -4,6 +4,7 @@ pluginManagement {
         mavenCentral()
         jcenter()
         gradlePluginPortal()
+        maven { url 'https://jitpack.io' }
     }
 }
 
@@ -13,6 +14,7 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         jcenter()
+        maven { url 'https://jitpack.io' }
     }
 }
 

client/android/shadowsocks/build.gradle

@@ -59,11 +59,11 @@ dependencies {
     implementation "com.google.code.gson:gson:2.8.5"
 
     implementation "dnsjava:dnsjava:2.1.9"
-    implementation "org.connectbot.jsocks:jsocks:1.0.0"
+    implementation "com.github.kruton:jsocks:1.0.0"
     implementation "com.afollestad.material-dialogs:core:2.6.0"
 //    api "com.takisoft.preferencex:preferencex:1.0.0"
     implementation 'com.takisoft.preferencex:preferencex:1.1.0'
-    api 'org.connectbot.jsocks:jsocks:1.0.0'
+    api 'com.github.kruton:jsocks:1.0.0'
 
     kapt "androidx.room:room-compiler:$roomVersion"
     kapt "androidx.lifecycle:lifecycle-compiler:2.4.0"

client/android/shadowsocks/src/main/jniLibs

@@ -0,0 +1 @@
+../../../../../client/3rd-prebuilt/3rd-prebuilt/shadowsocks/android

client/android/src/com/wireguard/android/backend/GoBackend.java

@@ -0,0 +1,19 @@
+package com.wireguard.android.backend;
+
+
+public final class GoBackend {
+    private static final String TAG = "WireGuard/GoBackend";
+
+    public static native String wgGetConfig(int handle);
+
+    public static native int wgGetSocketV4(int handle);
+
+    public static native int wgGetSocketV6(int handle);
+
+    public static native void wgTurnOff(int handle);
+
+    public static native int wgTurnOn(String ifName, int tunFd, String settings);
+
+    public static native String wgVersion();
+
+}

client/android/src/org/amnezia/vpn/VPNService.kt

@@ -20,6 +20,7 @@ import androidx.core.content.FileProvider
 import com.wireguard.android.util.SharedLibraryLoader
 import com.wireguard.config.*
 import com.wireguard.crypto.Key
+import com.wireguard.android.backend.GoBackend
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -121,23 +122,6 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
                 })
         }
 
-        @JvmStatic
-        private external fun wgGetConfig(handle: Int): String?
-
-        @JvmStatic
-        private external fun wgGetSocketV4(handle: Int): Int
-
-        @JvmStatic
-        private external fun wgGetSocketV6(handle: Int): Int
-
-        @JvmStatic
-        private external fun wgTurnOff(handle: Int)
-
-        @JvmStatic
-        private external fun wgTurnOn(ifName: String, tunFd: Int, settings: String): Int
-
-        @JvmStatic
-        private external fun wgVersion(): String?
     }
 
     private var mBinder: VPNServiceBinder = VPNServiceBinder(this)
@@ -162,17 +146,14 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
         SharedLibraryLoader.loadSharedLibrary(this, "wg-go")
         SharedLibraryLoader.loadSharedLibrary(this, "ovpn3")
         Log.i(tag, "Loaded libs")
-        Log.e(tag, "Wireguard Version ${wgVersion()}")
+        Log.e(tag, "Wireguard Version ${GoBackend.wgVersion()}")
         mOpenVPNThreadv3 = OpenVPNThreadv3(this)
         mAlreadyInitialised = true
     }
 
     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 {
@@ -185,7 +166,7 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
     }
 
     override fun onDestroy() {
-        turnOff()
+        //turnOff()
 
         super.onDestroy()
     }
@@ -268,7 +249,6 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
     // Invoked when the application is revoked.
     // At this moment, the VPN interface is already deactivated by the system.
     override fun onRevoke() {
-        Log.v(tag, "Aman: onRevoke....................")
         this.turnOff()
         super.onRevoke()
     }
@@ -367,7 +347,6 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
     }
 
     fun turnOn(json: JSONObject?): Int {
-        Log.v(tag, "Aman: turnOn....................")
         if (!checkPermissions()) {
             Log.e(tag, "turn on was called without no permissions present!")
             isUp = false
@@ -401,7 +380,6 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
     }
 
     fun establish(): ParcelFileDescriptor? {
-        Log.v(tag, "Aman: establish....................")
         mbuilder.allowFamily(OsConstants.AF_INET)
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) mbuilder.setMetered(false)
@@ -452,10 +430,9 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
     }
 
     fun turnOff() {
-        Log.v(tag, "Aman: turnOff....................")
         when (mProtocol) {
             "wireguard" -> {
-                wgTurnOff(currentTunnelHandle)
+                GoBackend.wgTurnOff(currentTunnelHandle)
             }
             "cloak",
             "openvpn" -> {
@@ -520,7 +497,7 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
         if (!isUp) {
             return null
         }
-        val config = wgGetConfig(currentTunnelHandle) ?: return null
+        val config = GoBackend.wgGetConfig(currentTunnelHandle) ?: return null
         val lines = config.split("\n")
         for (line in lines) {
             val parts = line.split("=")
@@ -718,7 +695,7 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
         if (currentTunnelHandle != -1) {
             Log.e(tag, "Tunnel already up")
             // Turn the tunnel down because this might be a switch
-            wgTurnOff(currentTunnelHandle)
+            GoBackend.wgTurnOff(currentTunnelHandle)
         }
         val wgConfig: String = wireguard_conf.toWgUserspaceString()
         val builder = Builder()
@@ -726,16 +703,15 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
         builder.setSession("Amnezia")
         builder.establish().use { tun ->
             if (tun == null) return
-            Log.i(tag, "Go backend " + wgVersion())
-            currentTunnelHandle = wgTurnOn("Amnezia", tun.detachFd(), wgConfig)
+            currentTunnelHandle = GoBackend.wgTurnOn("Amnezia", tun.detachFd(), wgConfig)
         }
         if (currentTunnelHandle < 0) {
             Log.e(tag, "Activation Error Code -> $currentTunnelHandle")
             isUp = false
             return
         }
-        protect(wgGetSocketV4(currentTunnelHandle))
-        protect(wgGetSocketV6(currentTunnelHandle))
+        protect(GoBackend.wgGetSocketV4(currentTunnelHandle))
+        protect(GoBackend.wgGetSocketV6(currentTunnelHandle))
         isUp = true
 
         // Store the config in case the service gets

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

client/android/src/org/amnezia/vpn/qt/AmneziaApp.kt

@@ -7,7 +7,7 @@ import org.qtproject.qt.android.bindings.QtActivity
 import org.qtproject.qt.android.bindings.QtApplication
 import android.app.Application
 
-class AmneziaApp: Application() {
+class AmneziaApp: org.qtproject.qt.android.bindings.QtApplication() {
 
     override fun onCreate() {
         super.onCreate()
@@ -19,4 +19,4 @@ class AmneziaApp: Application() {
         super.onConfigurationChanged(newConfig)
         Core.updateNotificationChannels()
     }
-}
+}

client/android/src/org/amnezia/vpn/qt/VPNActivity.kt

@@ -5,8 +5,6 @@
 package org.amnezia.vpn.qt;
 
 import android.Manifest
-import android.content.ClipData
-import android.content.ClipboardManager
 import android.content.ComponentName
 import android.content.ContentResolver
 import android.content.Context
@@ -73,10 +71,6 @@ class VPNActivity : org.qtproject.qt.android.bindings.QtActivity() {
         @JvmStatic fun saveFileAs(fileContent: String, suggestedName: String) {
             VPNActivity.getInstance().saveFile(fileContent, suggestedName)
         }
-
-        @JvmStatic fun putTextToClipboard(text: String) {
-            VPNActivity.getInstance().putToClipboard(text)
-        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -109,18 +103,6 @@ class VPNActivity : org.qtproject.qt.android.bindings.QtActivity() {
         startActivityForResult(intent, CREATE_FILE_ACTION_CODE)
     }
 
-    override fun getSystemService(name: String): Any? {
-        return if (Build.VERSION.SDK_INT >= 29 && name == "clipboard") {
-            // QT will always attempt to read the clipboard if content is there.
-            // since we have no use of the clipboard in android 10+
-            // we _can_  return null
-            // And we definitely should since android 12 displays clipboard access.
-            null
-        } else {
-            super.getSystemService(name)
-        }
-    }
-
     external fun handleBackButton(): Boolean
 
     external fun onServiceMessage(actionCode: Int, body: String?)
@@ -317,15 +299,4 @@ class VPNActivity : org.qtproject.qt.android.bindings.QtActivity() {
 
         tmpFileContentToSave = ""
     }
-
-    private fun putToClipboard(text: String) {
-        this.runOnUiThread {
-            val clipboard = applicationContext.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager?
-
-            if (clipboard != null) {
-                val clip: ClipData = ClipData.newPlainText("", text)
-                clipboard.setPrimaryClip(clip)
-            }
-        }
-    }
 }

client/android/src/org/amnezia/vpn/qt/VPNApplication.java

@@ -1,24 +0,0 @@
-package org.amnezia.vpn.qt;
-
-import android.content.res.Configuration;
-import androidx.annotation.NonNull;
-import org.amnezia.vpn.shadowsocks.core.Core;
-import org.amnezia.vpn.shadowsocks.core.VpnManager;
-
-public class VPNApplication extends org.qtproject.qt.android.bindings.QtApplication {
-    private static VPNApplication instance;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        VPNApplication.instance = this;
-//        Core.INSTANCE.init(this, VPNActivity.class);
-//        VpnManager.Companion.getInstance().init(this);
-    }
-
-    @Override
-    public void onConfigurationChanged(@NonNull Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-//        Core.INSTANCE.updateNotificationChannels();
-    }
-}

client/android/src/org/ftylitak/qzxing/NativeFunctions.java

@@ -1,6 +0,0 @@
-package org.ftylitak.qzxing;
-
-public class NativeFunctions {
-    public static native void onPermissionsGranted();
-    public static native void onPermissionsDenied();
-}

client/android/src/org/ftylitak/qzxing/QZXingLiveActivity.java

@@ -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;
-            }
-        }
-    }
-}

client/android/src/org/ftylitak/qzxing/Utilities.java

@@ -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<String> 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);
-    }
-
-
-}

client/android/wireguard/CMakeLists.txt

@@ -1,44 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
-
-cmake_minimum_required(VERSION 3.4.1)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
-
-message("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}")
-set( CMAKE_WG_TOOLS_DIR ../../../../desktop-client/client/3rd/wireguard-tools )
-
-
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif(CCACHE_FOUND)
-
-# Work around https://github.com/android-ndk/ndk/issues/602
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
-
-add_executable(libwg-quick.so ${CMAKE_WG_TOOLS_DIR}/src/wg-quick/android.c ndk-compat/compat.c)
-target_compile_options(libwg-quick.so PUBLIC -O3 -std=gnu11 -Wall -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DWG_PACKAGE_NAME=\"${ANDROID_PACKAGE_NAME}\")
-target_link_libraries(libwg-quick.so -ldl)
-
-file(GLOB WG_SOURCES ${CMAKE_WG_TOOLS_DIR}/src/*.c ndk-compat/compat.c)
-add_executable(libwg.so ${WG_SOURCES})
-target_include_directories(libwg.so PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_WG_TOOLS_DIR}/src/uapi/linux/" "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_WG_TOOLS_DIR}/src/")
-target_compile_options(libwg.so PUBLIC -O3 -std=gnu11 -D_GNU_SOURCE -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DHAVE_VISIBILITY_HIDDEN -DRUNSTATEDIR=\"/data/data/${ANDROID_PACKAGE_NAME}/cache\")
-
-add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libwg-go" COMMENT "Building wireguard-go" VERBATIM COMMAND make
-    ANDROID_ARCH_NAME=${ANDROID_ARCH_NAME}
-    ANDROID_C_COMPILER=${ANDROID_C_COMPILER}
-    ANDROID_TOOLCHAIN_ROOT=${ANDROID_TOOLCHAIN_ROOT}
-    ANDROID_LLVM_TRIPLE=${ANDROID_LLVM_TRIPLE}
-    ANDROID_SYSROOT=${ANDROID_SYSROOT}
-    ANDROID_PACKAGE_NAME=${ANDROID_PACKAGE_NAME}
-    GRADLE_USER_HOME=${GRADLE_USER_HOME}
-    CFLAGS=${CMAKE_C_FLAGS}\ -Wno-unused-command-line-argument
-    LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}\ -fuse-ld=gold
-    DESTDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-    BUILDDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../generated-src
-)
-# Hack to make it actually build as part of the default target
-add_dependencies(libwg.so libwg-go.so)

client/android/wireguard/libwg-go/Makefile

@@ -1,52 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
-
-BUILDDIR ?= $(CURDIR)/build
-DESTDIR ?= $(CURDIR)/out
-
-NDK_GO_ARCH_MAP_x86 := 386
-NDK_GO_ARCH_MAP_x86_64 := amd64
-NDK_GO_ARCH_MAP_arm := arm
-NDK_GO_ARCH_MAP_arm64 := arm64
-NDK_GO_ARCH_MAP_mips := mipsx
-NDK_GO_ARCH_MAP_mips64 := mips64x
-
-CLANG_FLAGS := --target=$(ANDROID_LLVM_TRIPLE) --gcc-toolchain=$(ANDROID_TOOLCHAIN_ROOT) --sysroot=$(ANDROID_SYSROOT)
-export CGO_CFLAGS := $(CLANG_FLAGS) $(CFLAGS)
-export CGO_LDFLAGS := $(CLANG_FLAGS) $(LDFLAGS) -Wl,-soname=libwg-go.so
-export CC := $(ANDROID_C_COMPILER)
-export GOARCH := $(NDK_GO_ARCH_MAP_$(ANDROID_ARCH_NAME))
-export GOOS := android
-export CGO_ENABLED := 1
-
-GO_VERSION := 1.16
-GO_PLATFORM := $(shell uname -s | tr '[:upper:]' '[:lower:]')-$(NDK_GO_ARCH_MAP_$(shell uname -m))
-GO_TARBALL := go$(GO_VERSION).$(GO_PLATFORM).tar.gz
-GO_HASH_darwin-amd64 := 6000a9522975d116bf76044967d7e69e04e982e9625330d9a539a8b45395f9a8
-GO_HASH_darwin-arm64 := 4dac57c00168d30bbd02d95131d5de9ca88e04f2c5a29a404576f30ae9b54810
-GO_HASH_linux-amd64 := 013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2
-
-default: $(DESTDIR)/libwg-go.so
-
-$(GRADLE_USER_HOME)/caches/golang/$(GO_TARBALL):
-	mkdir -p "$(dir $@)"
-	flock "$@.lock" -c ' \
-	[ -f "$@" ] && exit 0; \
-	curl -o "$@.tmp" "https://dl.google.com/go/$(GO_TARBALL)" && \
-	echo "$(GO_HASH_$(GO_PLATFORM))  $@.tmp" | sha256sum -c && \
-	mv "$@.tmp" "$@"'
-
-$(BUILDDIR)/go-$(GO_VERSION)/.prepared: $(GRADLE_USER_HOME)/caches/golang/$(GO_TARBALL)
-	mkdir -p "$(dir $@)"
-	flock "$@.lock" -c ' \
-	[ -f "$@" ] && exit 0; \
-	tar -C "$(dir $@)" --strip-components=1 -xzf "$^" && \
-	patch -p1 -f -N -r- -d "$(dir $@)" < goruntime-boottime-over-monotonic.diff && \
-	touch "$@"'
-
-$(DESTDIR)/libwg-go.so: export PATH := $(BUILDDIR)/go-$(GO_VERSION)/bin/:$(PATH)
-$(DESTDIR)/libwg-go.so: $(BUILDDIR)/go-$(GO_VERSION)/.prepared go.mod
-	go build -tags linux -ldflags="-X golang.zx2c4.com/wireguard/ipc.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard" -v -trimpath -o "$@" -buildmode c-shared
-
-.DELETE_ON_ERROR:

client/android/wireguard/libwg-go/api-android.go

@@ -1,227 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (C) 2017-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- */
-
-package main
-
-// #cgo LDFLAGS: -llog
-// #include <android/log.h>
-import "C"
-
-import (
-	"fmt"
-	"math"
-	"net"
-	"os"
-	"os/signal"
-	"runtime"
-	"runtime/debug"
-	"strings"
-	"unsafe"
-
-	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/conn"
-	"golang.zx2c4.com/wireguard/device"
-	"golang.zx2c4.com/wireguard/ipc"
-	"golang.zx2c4.com/wireguard/tun"
-)
-
-type AndroidLogger struct {
-	level C.int
-	tag   *C.char
-}
-
-func cstring(s string) *C.char {
-	b, err := unix.BytePtrFromString(s)
-	if err != nil {
-		b := [1]C.char{}
-		return &b[0]
-	}
-	return (*C.char)(unsafe.Pointer(b))
-}
-
-func (l AndroidLogger) Printf(format string, args ...interface{}) {
-	C.__android_log_write(l.level, l.tag, cstring(fmt.Sprintf(format, args...)))
-}
-
-type TunnelHandle struct {
-	device *device.Device
-	uapi   net.Listener
-}
-
-var tunnelHandles map[int32]TunnelHandle
-
-func init() {
-	tunnelHandles = make(map[int32]TunnelHandle)
-	signals := make(chan os.Signal)
-	signal.Notify(signals, unix.SIGUSR2)
-	go func() {
-		buf := make([]byte, os.Getpagesize())
-		for {
-			select {
-			case <-signals:
-				n := runtime.Stack(buf, true)
-				if n == len(buf) {
-					n--
-				}
-				buf[n] = 0
-				C.__android_log_write(C.ANDROID_LOG_ERROR, cstring("WireGuard/GoBackend/Stacktrace"), (*C.char)(unsafe.Pointer(&buf[0])))
-			}
-		}
-	}()
-}
-
-//export wgTurnOn
-func wgTurnOn(interfaceName string, tunFd int32, settings string) int32 {
-	tag := cstring("WireGuard/GoBackend/" + interfaceName)
-	logger := &device.Logger{
-		Verbosef: AndroidLogger{level: C.ANDROID_LOG_DEBUG, tag: tag}.Printf,
-		Errorf:   AndroidLogger{level: C.ANDROID_LOG_ERROR, tag: tag}.Printf,
-	}
-
-	tun, name, err := tun.CreateUnmonitoredTUNFromFD(int(tunFd))
-	if err != nil {
-		unix.Close(int(tunFd))
-		logger.Errorf("CreateUnmonitoredTUNFromFD: %v", err)
-		return -1
-	}
-
-	logger.Verbosef("Attaching to interface %v", name)
-	device := device.NewDevice(tun, conn.NewStdNetBind(), logger)
-
-	err = device.IpcSet(settings)
-	if err != nil {
-		unix.Close(int(tunFd))
-		logger.Errorf("IpcSet: %v", err)
-		return -1
-	}
-	device.DisableSomeRoamingForBrokenMobileSemantics()
-
-	var uapi net.Listener
-
-	uapiFile, err := ipc.UAPIOpen(name)
-	if err != nil {
-		logger.Errorf("UAPIOpen: %v", err)
-	} else {
-		uapi, err = ipc.UAPIListen(name, uapiFile)
-		if err != nil {
-			uapiFile.Close()
-			logger.Errorf("UAPIListen: %v", err)
-		} else {
-			go func() {
-				for {
-					conn, err := uapi.Accept()
-					if err != nil {
-						return
-					}
-					go device.IpcHandle(conn)
-				}
-			}()
-		}
-	}
-
-	err = device.Up()
-	if err != nil {
-		logger.Errorf("Unable to bring up device: %v", err)
-		uapiFile.Close()
-		device.Close()
-		return -1
-	}
-	logger.Verbosef("Device started")
-
-	var i int32
-	for i = 0; i < math.MaxInt32; i++ {
-		if _, exists := tunnelHandles[i]; !exists {
-			break
-		}
-	}
-	if i == math.MaxInt32 {
-		logger.Errorf("Unable to find empty handle")
-		uapiFile.Close()
-		device.Close()
-		return -1
-	}
-	tunnelHandles[i] = TunnelHandle{device: device, uapi: uapi}
-	return i
-}
-
-//export wgTurnOff
-func wgTurnOff(tunnelHandle int32) {
-	handle, ok := tunnelHandles[tunnelHandle]
-	if !ok {
-		return
-	}
-	delete(tunnelHandles, tunnelHandle)
-	if handle.uapi != nil {
-		handle.uapi.Close()
-	}
-	handle.device.Close()
-}
-
-//export wgGetSocketV4
-func wgGetSocketV4(tunnelHandle int32) int32 {
-	handle, ok := tunnelHandles[tunnelHandle]
-	if !ok {
-		return -1
-	}
-	bind, _ := handle.device.Bind().(conn.PeekLookAtSocketFd)
-	if bind == nil {
-		return -1
-	}
-	fd, err := bind.PeekLookAtSocketFd4()
-	if err != nil {
-		return -1
-	}
-	return int32(fd)
-}
-
-//export wgGetSocketV6
-func wgGetSocketV6(tunnelHandle int32) int32 {
-	handle, ok := tunnelHandles[tunnelHandle]
-	if !ok {
-		return -1
-	}
-	bind, _ := handle.device.Bind().(conn.PeekLookAtSocketFd)
-	if bind == nil {
-		return -1
-	}
-	fd, err := bind.PeekLookAtSocketFd6()
-	if err != nil {
-		return -1
-	}
-	return int32(fd)
-}
-
-//export wgGetConfig
-func wgGetConfig(tunnelHandle int32) *C.char {
-	handle, ok := tunnelHandles[tunnelHandle]
-	if !ok {
-		return nil
-	}
-	settings, err := handle.device.IpcGet()
-	if err != nil {
-		return nil
-	}
-	return C.CString(settings)
-}
-
-//export wgVersion
-func wgVersion() *C.char {
-	info, ok := debug.ReadBuildInfo()
-	if !ok {
-		return C.CString("unknown")
-	}
-	for _, dep := range info.Deps {
-		if dep.Path == "golang.zx2c4.com/wireguard" {
-			parts := strings.Split(dep.Version, "-")
-			if len(parts) == 3 && len(parts[2]) == 12 {
-				return C.CString(parts[2][:7])
-			}
-			return C.CString(dep.Version)
-		}
-	}
-	return C.CString("unknown")
-}
-
-func main() {}

client/android/wireguard/libwg-go/go.mod

@@ -1,10 +0,0 @@
-module golang.zx2c4.com/wireguard/android
-
-go 1.16
-
-require (
-	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
-	golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d // indirect
-	golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43
-	golang.zx2c4.com/wireguard v0.0.0-20210222142647-219296a1e787
-)

client/android/wireguard/libwg-go/go.sum

@@ -1,21 +0,0 @@
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g=
-golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d h1:1aflnvSoWWLI2k/dMUAl5lvU1YO4Mb4hz0gh+1rjcxU=
-golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210105210732-16f7687f5001/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43 h1:SgQ6LNaYJU0JIuEHv9+s6EbhSCwYeAf5Yvj6lpYlqAE=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.zx2c4.com/wireguard v0.0.0-20210222142647-219296a1e787 h1:zrctiUlt4hD1sgxBYrG5CAjobVhpdxnUXy+qyWWLR1w=
-golang.zx2c4.com/wireguard v0.0.0-20210222142647-219296a1e787/go.mod h1:LofpIKqPJNvHiwKXuzsBshJCTe7IgRAz3iizquljFDk=

client/android/wireguard/libwg-go/goruntime-boottime-over-monotonic.diff

@@ -1,161 +0,0 @@
-From b83553d9f260ba20c6faaa52e6fe6f74309eb41a Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Mon, 22 Feb 2021 02:36:03 +0100
-Subject: [PATCH] runtime: use CLOCK_BOOTTIME in nanotime on Linux
-
-This makes timers account for having expired while a computer was
-asleep, which is quite common on mobile devices. Note that BOOTTIME is
-identical to MONOTONIC, except that it takes into account time spent
-in suspend. In Linux 4.17, the kernel will actually make MONOTONIC act
-like BOOTTIME anyway, so this switch will additionally unify the
-timer behavior across kernels.
-
-BOOTTIME was introduced into Linux 2.6.39-rc1 with 70a08cca1227d in
-2011.
-
-Fixes #24595
-
-Change-Id: I7b2a6ca0c5bc5fce57ec0eeafe7b68270b429321
----
- src/runtime/sys_linux_386.s     | 4 ++--
- src/runtime/sys_linux_amd64.s   | 2 +-
- src/runtime/sys_linux_arm.s     | 4 ++--
- src/runtime/sys_linux_arm64.s   | 4 ++--
- src/runtime/sys_linux_mips64x.s | 2 +-
- src/runtime/sys_linux_mipsx.s   | 2 +-
- src/runtime/sys_linux_ppc64x.s  | 2 +-
- src/runtime/sys_linux_s390x.s   | 2 +-
- 8 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
-index 1e3a834812..78b6021fc7 100644
---- a/src/runtime/sys_linux_386.s
-+++ b/src/runtime/sys_linux_386.s
-@@ -337,13 +337,13 @@ noswitch:
- 
- 	LEAL	8(SP), BX	// &ts (struct timespec)
- 	MOVL	BX, 4(SP)
--	MOVL	$1, 0(SP)	// CLOCK_MONOTONIC
-+	MOVL	$7, 0(SP)	// CLOCK_BOOTTIME
- 	CALL	AX
- 	JMP finish
- 
- fallback:
- 	MOVL	$SYS_clock_gettime, AX
--	MOVL	$1, BX		// CLOCK_MONOTONIC
-+	MOVL	$7, BX		// CLOCK_BOOTTIME
- 	LEAL	8(SP), CX
- 	INVOKE_SYSCALL
- 
-diff --git a/src/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s
-index 37cb8dad03..e8b730bcaa 100644
---- a/src/runtime/sys_linux_amd64.s
-+++ b/src/runtime/sys_linux_amd64.s
-@@ -302,7 +302,7 @@ noswitch:
- 	SUBQ	$16, SP		// Space for results
- 	ANDQ	$~15, SP	// Align for C code
- 
--	MOVL	$1, DI // CLOCK_MONOTONIC
-+	MOVL	$7, DI // CLOCK_BOOTTIME
- 	LEAQ	0(SP), SI
- 	MOVQ	runtime·vdsoClockgettimeSym(SB), AX
- 	CMPQ	AX, $0
-diff --git a/src/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s
-index 475f52344c..bb567abcf4 100644
---- a/src/runtime/sys_linux_arm.s
-+++ b/src/runtime/sys_linux_arm.s
-@@ -11,7 +11,7 @@
- #include "textflag.h"
- 
- #define CLOCK_REALTIME	0
--#define CLOCK_MONOTONIC	1
-+#define CLOCK_BOOTTIME	7
- 
- // for EABI, as we don't support OABI
- #define SYS_BASE 0x0
-@@ -366,7 +366,7 @@ noswitch:
- 	SUB	$24, R13	// Space for results
- 	BIC	$0x7, R13	// Align for C code
- 
--	MOVW	$CLOCK_MONOTONIC, R0
-+	MOVW	$CLOCK_BOOTTIME, R0
- 	MOVW	$8(R13), R1	// timespec
- 	MOVW	runtime·vdsoClockgettimeSym(SB), R2
- 	CMP	$0, R2
-diff --git a/src/runtime/sys_linux_arm64.s b/src/runtime/sys_linux_arm64.s
-index 198a5bacef..9715387f36 100644
---- a/src/runtime/sys_linux_arm64.s
-+++ b/src/runtime/sys_linux_arm64.s
-@@ -13,7 +13,7 @@
- #define AT_FDCWD -100
- 
- #define CLOCK_REALTIME 0
--#define CLOCK_MONOTONIC 1
-+#define CLOCK_BOOTTIME 7
- 
- #define SYS_exit		93
- #define SYS_read		63
-@@ -319,7 +319,7 @@ noswitch:
- 	BIC	$15, R1
- 	MOVD	R1, RSP
- 
--	MOVW	$CLOCK_MONOTONIC, R0
-+	MOVW	$CLOCK_BOOTTIME, R0
- 	MOVD	runtime·vdsoClockgettimeSym(SB), R2
- 	CBZ	R2, fallback
- 
-diff --git a/src/runtime/sys_linux_mips64x.s b/src/runtime/sys_linux_mips64x.s
-index c3e9f37694..e3879acd38 100644
---- a/src/runtime/sys_linux_mips64x.s
-+++ b/src/runtime/sys_linux_mips64x.s
-@@ -312,7 +312,7 @@ noswitch:
- 	AND	$~15, R1	// Align for C code
- 	MOVV	R1, R29
- 
--	MOVW	$1, R4 // CLOCK_MONOTONIC
-+	MOVW	$7, R4 // CLOCK_BOOTTIME
- 	MOVV	$0(R29), R5
- 
- 	MOVV	runtime·vdsoClockgettimeSym(SB), R25
-diff --git a/src/runtime/sys_linux_mipsx.s b/src/runtime/sys_linux_mipsx.s
-index fab2ab3892..f9af103594 100644
---- a/src/runtime/sys_linux_mipsx.s
-+++ b/src/runtime/sys_linux_mipsx.s
-@@ -238,7 +238,7 @@ TEXT runtime·walltime1(SB),NOSPLIT,$8-12
- 	RET
- 
- TEXT runtime·nanotime1(SB),NOSPLIT,$8-8
--	MOVW	$1, R4	// CLOCK_MONOTONIC
-+	MOVW	$7, R4	// CLOCK_BOOTTIME
- 	MOVW	$4(R29), R5
- 	MOVW	$SYS_clock_gettime, R2
- 	SYSCALL
-diff --git a/src/runtime/sys_linux_ppc64x.s b/src/runtime/sys_linux_ppc64x.s
-index fd69ee70a5..ff6bc8355b 100644
---- a/src/runtime/sys_linux_ppc64x.s
-+++ b/src/runtime/sys_linux_ppc64x.s
-@@ -249,7 +249,7 @@ fallback:
- 	JMP	finish
- 
- TEXT runtime·nanotime1(SB),NOSPLIT,$16-8
--	MOVD	$1, R3		// CLOCK_MONOTONIC
-+	MOVD	$7, R3		// CLOCK_BOOTTIME
- 
- 	MOVD	R1, R15		// R15 is unchanged by C code
- 	MOVD	g_m(g), R21	// R21 = m
-diff --git a/src/runtime/sys_linux_s390x.s b/src/runtime/sys_linux_s390x.s
-index c15a1d5364..f52c4d5098 100644
---- a/src/runtime/sys_linux_s390x.s
-+++ b/src/runtime/sys_linux_s390x.s
-@@ -207,7 +207,7 @@ TEXT runtime·walltime1(SB),NOSPLIT,$16
- 	RET
- 
- TEXT runtime·nanotime1(SB),NOSPLIT,$16
--	MOVW	$1, R2 // CLOCK_MONOTONIC
-+	MOVW	$7, R2 // CLOCK_BOOTTIME
- 	MOVD	$tp-16(SP), R3
- 	MOVW	$SYS_clock_gettime, R1
- 	SYSCALL
--- 
-2.30.1
-

client/android/wireguard/libwg-go/jni.c

@@ -1,70 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0
- *
- * Copyright © 2017-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights
- * Reserved.
- */
-
-#include <jni.h>
-#include <stdlib.h>
-#include <string.h>
-
-struct go_string {
-  const char* str;
-  long n;
-};
-extern int wgTurnOn(struct go_string ifname, int tun_fd,
-                    struct go_string settings);
-extern void wgTurnOff(int handle);
-extern int wgGetSocketV4(int handle);
-extern int wgGetSocketV6(int handle);
-extern char* wgGetConfig(int handle);
-extern char* wgVersion();
-
-JNIEXPORT jint JNICALL Java_org_amnezia_vpn_VPNService_wgTurnOn(
-    JNIEnv* env, jclass c, jstring ifname, jint tun_fd, jstring settings) {
-  const char* ifname_str = (*env)->GetStringUTFChars(env, ifname, 0);
-  size_t ifname_len = (*env)->GetStringUTFLength(env, ifname);
-  const char* settings_str = (*env)->GetStringUTFChars(env, settings, 0);
-  size_t settings_len = (*env)->GetStringUTFLength(env, settings);
-  int ret =
-      wgTurnOn((struct go_string){.str = ifname_str, .n = ifname_len}, tun_fd,
-               (struct go_string){.str = settings_str, .n = settings_len});
-  (*env)->ReleaseStringUTFChars(env, ifname, ifname_str);
-  (*env)->ReleaseStringUTFChars(env, settings, settings_str);
-  return ret;
-}
-
-JNIEXPORT void JNICALL Java_org_amnezia_vpn_VPNService_wgTurnOff(
-    JNIEnv* env, jclass c, jint handle) {
-  wgTurnOff(handle);
-}
-
-JNIEXPORT jint JNICALL Java_org_amnezia_vpn_VPNService_wgGetSocketV4(
-    JNIEnv* env, jclass c, jint handle) {
-  return wgGetSocketV4(handle);
-}
-
-JNIEXPORT jint JNICALL Java_org_amnezia_vpn_VPNService_wgGetSocketV6(
-    JNIEnv* env, jclass c, jint handle) {
-  return wgGetSocketV6(handle);
-}
-
-JNIEXPORT jstring JNICALL Java_org_amnezia_vpn_VPNService_wgGetConfig(
-    JNIEnv* env, jclass c, jint handle) {
-  jstring ret;
-  char* config = wgGetConfig(handle);
-  if (!config) return NULL;
-  ret = (*env)->NewStringUTF(env, config);
-  free(config);
-  return ret;
-}
-
-JNIEXPORT jstring JNICALL
-Java_org_amnezia_vpn_VPNService_wgVersion(JNIEnv* env, jclass c) {
-  jstring ret;
-  char* version = wgVersion();
-  if (!version) return NULL;
-  ret = (*env)->NewStringUTF(env, version);
-  free(version);
-  return ret;
-}

client/android/wireguard/ndk-compat/compat.c

@@ -1,71 +0,0 @@
-/* SPDX-License-Identifier: BSD
- *
- * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
- *
- */
-
-#define FILE_IS_EMPTY
-
-#if defined(__ANDROID_API__) && __ANDROID_API__ < 18
-#  undef FILE_IS_EMPTY
-#  include <stdio.h>
-#  include <stdlib.h>
-
-ssize_t getdelim(char** buf, size_t* bufsiz, int delimiter, FILE* fp) {
-  char *ptr, *eptr;
-
-  if (*buf == NULL || *bufsiz == 0) {
-    *bufsiz = BUFSIZ;
-    if ((*buf = malloc(*bufsiz)) == NULL) return -1;
-  }
-
-  for (ptr = *buf, eptr = *buf + *bufsiz;;) {
-    int c = fgetc(fp);
-    if (c == -1) {
-      if (feof(fp)) {
-        ssize_t diff = (ssize_t)(ptr - *buf);
-        if (diff != 0) {
-          *ptr = '\0';
-          return diff;
-        }
-      }
-      return -1;
-    }
-    *ptr++ = c;
-    if (c == delimiter) {
-      *ptr = '\0';
-      return ptr - *buf;
-    }
-    if (ptr + 2 >= eptr) {
-      char* nbuf;
-      size_t nbufsiz = *bufsiz * 2;
-      ssize_t d = ptr - *buf;
-      if ((nbuf = realloc(*buf, nbufsiz)) == NULL) return -1;
-      *buf = nbuf;
-      *bufsiz = nbufsiz;
-      eptr = nbuf + nbufsiz;
-      ptr = nbuf + d;
-    }
-  }
-}
-
-ssize_t getline(char** buf, size_t* bufsiz, FILE* fp) {
-  return getdelim(buf, bufsiz, '\n', fp);
-}
-#endif
-
-#if defined(__ANDROID_API__) && __ANDROID_API__ < 24
-#  undef FILE_IS_EMPTY
-#  include <string.h>
-
-char* strchrnul(const char* s, int c) {
-  char* x = strchr(s, c);
-  if (!x) return (char*)s + strlen(s);
-  return x;
-}
-#endif
-
-#ifdef FILE_IS_EMPTY
-#  undef FILE_IS_EMPTY
-static char ____x __attribute__((unused));
-#endif

client/android/wireguard/ndk-compat/compat.h

@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: BSD
- *
- * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
- *
- */
-
-#if defined(__ANDROID_API__) && __ANDROID_API__ < 18
-#  include <stdio.h>
-ssize_t getdelim(char** buf, size_t* bufsiz, int delimiter, FILE* fp);
-ssize_t getline(char** buf, size_t* bufsiz, FILE* fp);
-#endif
-
-#if defined(__ANDROID_API__) && __ANDROID_API__ < 24
-char* strchrnul(const char* s, int c);
-#endif

client/cmake/3rdparty.cmake

@@ -46,46 +46,49 @@ if(IOS)
 
     include_directories(${CLIENT_ROOT_DIR}/3rd/mbedtls/include)
 else(IOS)
-    if(NOT LINUX)
-        set(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/3rd/OpenSSL")
-        set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include")
-        set(OPENSSL_LIBRARIES_DIR "${OPENSSL_ROOT_DIR}/lib")
-        set(OPENSSL_LIBRARIES "ssl" "crypto")
+    set(OPENSSL_ROOT_DIR "${CLIENT_ROOT_DIR}/3rd/OpenSSL")
+    set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include")
+    set(OPENSSL_LIBRARIES_DIR "${OPENSSL_ROOT_DIR}/lib")
+    set(OPENSSL_LIBRARIES "ssl" "crypto")
 
-        set(OPENSSL_PATH "${CLIENT_ROOT_DIR}/3rd/OpenSSL")
-        if(WIN32)
-            if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
-                set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/windows/x86_64/libssl.lib")
-                set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/x86_64/libcrypto.lib")
-            else()
-                set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/windows/x86/libssl.lib")
-                set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/x86/libcrypto.lib")
-            endif()
-        elseif(APPLE AND NOT IOS)
-            set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libssl.a")
-            set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libcrypto.a")
-        elseif(IOS)
-            set(OPENSSL_CRYPTO_LIBRARY "${OPENSSL_LIBRARIES_DIR}/libcrypto.a")
-            set(OPENSSL_SSL_LIBRARY "${OPENSSL_LIBRARIES_DIR}/libssl.a")
-            set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/ios/iphone/libssl.a")
-            set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/ios/iphone/libcrypto.a")
-        elseif(ANDROID)
-            set(abi ${CMAKE_ANDROID_ARCH_ABI})
-
-            set(OPENSSL_CRYPTO_LIBRARY "${OPENSSL_LIBRARIES_DIR}/android/${abi}/libcrypto.a")
-            set(OPENSSL_SSL_LIBRARY "${OPENSSL_LIBRARIES_DIR}/android/${abi}/libssl.a")
-            set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/android/${abi}/libssl.a")
-            set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/android/${abi}/libcrypto.a")
-
-            set(OPENSSL_LIBRARIES_DIR "${OPENSSL_LIBRARIES_DIR}/android/${abi}")
+    set(OPENSSL_PATH "${CLIENT_ROOT_DIR}/3rd/OpenSSL")
+    if(WIN32)
+        set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/lib/windows/include")
+        if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+            set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/windows/win64/libssl.lib")
+            set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/win64/libcrypto.lib")
+        else()
+            set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/windows/win32/libssl.lib")
+            set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/win32/libcrypto.lib")
         endif()
+    elseif(APPLE AND NOT IOS)
+        set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libssl.a")
+        set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libcrypto.a")
+    elseif(IOS)
+        set(OPENSSL_CRYPTO_LIBRARY "${OPENSSL_LIBRARIES_DIR}/libcrypto.a")
+        set(OPENSSL_SSL_LIBRARY "${OPENSSL_LIBRARIES_DIR}/libssl.a")
+        set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/ios/iphone/libssl.a")
+        set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/ios/iphone/libcrypto.a")
+    elseif(ANDROID)
+        set(abi ${CMAKE_ANDROID_ARCH_ABI})
+        set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/lib/android/include")
+        set(OPENSSL_CRYPTO_LIBRARY "${OPENSSL_LIBRARIES_DIR}/android/${abi}/libcrypto.a")
+        set(OPENSSL_SSL_LIBRARY "${OPENSSL_LIBRARIES_DIR}/android/${abi}/libssl.a")
+        set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/android/${abi}/libssl.a")
+        set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/android/${abi}/libcrypto.a")
 
-        file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH}
-            DESTINATION ${OPENSSL_LIBRARIES_DIR})
-        file(COPY "${OPENSSL_PATH}/include"
-            DESTINATION ${OPENSSL_ROOT_DIR})
+        set(OPENSSL_LIBRARIES_DIR "${OPENSSL_LIBRARIES_DIR}/android/${abi}")
+    elseif(LINUX)
+        set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/lib/linux/include")
+        set(OPENSSL_CRYPTO_LIBRARY "${OPENSSL_LIBRARIES_DIR}/linux/${CMAKE_SYSTEM_PROCESSOR}/libcrypto.a")
+        set(OPENSSL_SSL_LIBRARY "${OPENSSL_LIBRARIES_DIR}/linux/${CMAKE_SYSTEM_PROCESSOR}/libssl.a")
+        set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/linux/${CMAKE_SYSTEM_PROCESSOR}/libssl.a")
+        set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/linux/${CMAKE_SYSTEM_PROCESSOR}/libcrypto.a")
     endif()
 
+    file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH}
+         DESTINATION ${OPENSSL_LIBRARIES_DIR})
+
     set(OPENSSL_USE_STATIC_LIBS TRUE)
     find_package(OpenSSL REQUIRED)
     set(LIBS ${LIBS}
@@ -106,7 +109,7 @@ add_subdirectory(${CLIENT_ROOT_DIR}/3rd/qtkeychain)
 set(LIBS ${LIBS} qt6keychain)
 
 include_directories(
-    ${CLIENT_ROOT_DIR}/3rd/OpenSSL/include
+    ${OPENSSL_INCLUDE_DIR}
     ${CLIENT_ROOT_DIR}/3rd/libssh/include
     ${CLIENT_ROOT_DIR}/3rd/QSimpleCrypto/include
     ${CLIENT_ROOT_DIR}/3rd/qtkeychain

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/images/AmneziaVPN_Full_logo.svg.license

@@ -0,0 +1,2 @@
+File AmneziaVPN_Full_logo.svg licensed by CC-BY-SA 4.0
+Full license text - https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt

client/main.cpp

@@ -1,4 +1,3 @@
-#include <QLoggingCategory>
 #include <QDebug>
 #include <QTimer>
 
@@ -6,6 +5,8 @@
 #include "version.h"
 #include "migrations.h"
 
+#include <QTimer>
+
 #ifdef Q_OS_WIN
 #include "Windows.h"
 #endif
@@ -20,7 +21,6 @@ int main(int argc, char *argv[])
     Migrations migrationsManager;
     migrationsManager.doMigrations();
 
-    QLoggingCategory::setFilterRules(QStringLiteral("qtc.ssh=false"));
     QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
 
 #ifdef Q_OS_WIN

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());
 }
 
@@ -267,11 +264,6 @@ void AndroidController::startQrReaderActivity()
     AndroidVPNActivity::instance()->startQrCodeReader();
 }
 
-void AndroidController::copyTextToClipboard(QString text)
-{
-    AndroidVPNActivity::instance()->copyTextToClipboard(text);
-}
-
 void AndroidController::scheduleStatusCheckSlot()
 {
     QTimer::singleShot(1000, [this]() {

client/platforms/android/android_controller.h

@@ -43,7 +43,6 @@ public:
     void setVpnConfig(const QJsonObject &newVpnConfig);
 
     void startQrReaderActivity();
-    void copyTextToClipboard(QString text);
 
 signals:
     void connectionStateChanged(VpnProtocol::VpnConnectionState state);

client/platforms/android/androidvpnactivity.cpp

@@ -65,14 +65,6 @@ void AndroidVPNActivity::saveFileAs(QString fileContent, QString suggestedFilena
                 QJniObject::fromString(suggestedFilename).object<jstring>());
 }
 
-void AndroidVPNActivity::copyTextToClipboard(QString text)
-{
-    QJniObject::callStaticMethod<void>(
-                CLASSNAME,
-                "putTextToClipboard", "(Ljava/lang/String;)V",
-                QJniObject::fromString(text).object<jstring>());
-}
-
 // static
 AndroidVPNActivity* AndroidVPNActivity::instance() {
     if (s_instance == nullptr) {

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.
@@ -76,7 +77,6 @@ public:
     static void connectService();
     static void startQrCodeReader();
     static void saveFileAs(QString fileContent, QString suggestedFilename);
-    static void copyTextToClipboard(QString text);
 
 signals:
     void serviceConnected();

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

@@ -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<folderModelPages.count; i++) {
                                  createPagesObjects(folderModelPages.get(i, "filePath"), PageType.Basic);
                              }
@@ -131,39 +135,39 @@ Window  {
                          }
     }
 
-    FolderListModel {
+    LabsFolderlistmodel.FolderListModel {
         id: folderModelProtocols
         folder: "qrc:/ui/qml/Pages/Protocols/"
         nameFilters: ["*.qml"]
         showDirs: false
 
-        onStatusChanged: if (status == FolderListModel.Ready) {
+        onStatusChanged: if (status == LabsFolderlistmodel.FolderListModel.Ready) {
                              for (var i=0; i<folderModelProtocols.count; i++) {
                                  createPagesObjects(folderModelProtocols.get(i, "filePath"), PageType.Proto);
                              }
         }
     }
 
-    FolderListModel {
+    LabsFolderlistmodel.FolderListModel {
         id: folderModelShareProtocols
         folder: "qrc:/ui/qml/Pages/Share/"
         nameFilters: ["*.qml"]
         showDirs: false
 
-        onStatusChanged: if (status == FolderListModel.Ready) {
+        onStatusChanged: if (status == LabsFolderlistmodel.FolderListModel.Ready) {
                              for (var i=0; i<folderModelShareProtocols.count; i++) {
                                  createPagesObjects(folderModelShareProtocols.get(i, "filePath"), PageType.ShareProto);
                              }
         }
     }
 
-    FolderListModel {
+    LabsFolderlistmodel.FolderListModel {
         id: folderModelClientInfo
         folder: "qrc:/ui/qml/Pages/ClientInfo/"
         nameFilters: ["*.qml"]
         showDirs: false
 
-        onStatusChanged: if (status == FolderListModel.Ready) {
+        onStatusChanged: if (status == LabsFolderlistmodel.FolderListModel.Ready) {
                              for (var i=0; i<folderModelClientInfo.count; i++) {
                                  createPagesObjects(folderModelClientInfo.get(i, "filePath"), PageType.ClientInfo);
                              }
@@ -354,7 +358,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
 
@@ -476,11 +476,7 @@ void UiLogic::saveBinaryFile(const QString &desc, QString ext, const QString &da
 
 void UiLogic::copyToClipboard(const QString &text)
 {
-#ifdef Q_OS_ANDROID
-    AndroidController::instance()->copyTextToClipboard(text);
-#else
     qApp->clipboard()->setText(text);
-#endif
 }
 
 void UiLogic::shareTempFile(const QString &suggestedName, QString ext, const QString& data) {

deploy/build_linux.sh

@@ -28,6 +28,7 @@ APP_FILENAME=$APP_NAME.app
 APP_DOMAIN=org.amneziavpn.package
 
 DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/linux
+PREBUILT_DEPLOY_DATA_DIR=$PROJECT_DIR/client/3rd-prebuilt/deploy-prebuilt/linux/client/bin
 INSTALLER_DATA_DIR=$PROJECT_DIR/deploy/installer/packages/$APP_DOMAIN/data
 
 PRO_FILE_PATH=$PROJECT_DIR/$APP_NAME.pro
@@ -62,6 +63,7 @@ cmake --build . --config release
 #echo "............Deploy.................."
 
 cp -r $DEPLOY_DATA_DIR/* $APP_DIR
+cp -r $PREBUILT_DEPLOY_DATA_DIR $APP_DIR
 
 if [ ! -f $CQTDEPLOYER_DIR/cqtdeployer.sh ]; then
   wget -O $TOOLS_DIR/CQtDeployer.zip https://github.com/QuasarApp/CQtDeployer/releases/download/v1.5.4.17/CQtDeployer_1.5.4.17_Linux_x86_64.zip

deploy/build_macos.sh

@@ -28,7 +28,9 @@ PLIST_NAME=$APP_NAME.plist
 OUT_APP_DIR=$BUILD_DIR/client
 BUNDLE_DIR=$OUT_APP_DIR/$APP_FILENAME
 
+PREBUILT_DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/deploy-prebuilt/macos
 DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/macos
+
 INSTALLER_DATA_DIR=$BUILD_DIR/installer/packages/$APP_DOMAIN/data
 INSTALLER_BUNDLE_DIR=$BUILD_DIR/installer/$APP_FILENAME
 
@@ -38,8 +40,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
@@ -66,11 +68,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
@@ -116,6 +116,7 @@ fi
 echo "Packaging installer..."
 mkdir -p $INSTALLER_DATA_DIR
 cp -av $PROJECT_DIR/deploy/installer $BUILD_DIR
+cp -r $PREBUILT_DEPLOY_DATA_DIR/* $DEPLOY_DATA_DIR
 cp -av $DEPLOY_DATA_DIR/post_install.sh $INSTALLER_DATA_DIR/post_install.sh
 cp -av $DEPLOY_DATA_DIR/post_uninstall.sh $INSTALLER_DATA_DIR/post_uninstall.sh
 cp -av $DEPLOY_DATA_DIR/$PLIST_NAME $INSTALLER_DATA_DIR/$PLIST_NAME
@@ -147,7 +148,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..."

deploy/build_windows.bat

@@ -23,6 +23,7 @@ set APP_FILENAME=%APP_NAME:"=%.exe
 set APP_DOMAIN=org.amneziavpn.package
 set RELEASE_DIR=%WORK_DIR:"=%
 set OUT_APP_DIR=%RELEASE_DIR:"=%\client\release
+set PREBILT_DEPLOY_DATA_DIR=%SCRIPT_DIR:"=%\data\deploy-prebuilt\windows\x%BUILD_ARCH:"=%
 set DEPLOY_DATA_DIR=%SCRIPT_DIR:"=%\data\windows\x%BUILD_ARCH:"=%
 set INSTALLER_DATA_DIR=%RELEASE_DIR:"=%\installer\packages\%APP_DOMAIN:"=%\data
 set TARGET_FILENAME=%PROJECT_DIR:"=%\%APP_NAME:"=%_x%BUILD_ARCH:"=%.exe
@@ -76,6 +77,7 @@ signtool sign /v /sm /s My /n "Privacy Technologies OU" /fd sha256 /tr http://ti
 
 echo "Copying deploy data..."
 xcopy %DEPLOY_DATA_DIR%    %OUT_APP_DIR%  /s /e /y /i /f
+xcopy %PREBILT_DEPLOY_DATA_DIR%    %OUT_APP_DIR%  /s /e /y /i /f
 copy "%WORK_DIR:"=%\service\wireguard-service\release\wireguard-service.exe"	%OUT_APP_DIR%\wireguard\
 
 cd %SCRIPT_DIR%

deploy/data/deploy-prebuilt

@@ -0,0 +1 @@
+../../client/3rd-prebuilt/deploy-prebuilt/