Various fixes

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

@@ -43,6 +43,7 @@ class VPNService : android.net.VpnService() {
     }
 
     override fun onUnbind(intent: Intent?): Boolean {
+    Log.v(tag, "Got Unbind request")
         if (!isUp) {
             // If the Qt Client got closed while we were not connected
             // we do not need to stay as a foreground service.
@@ -128,6 +129,7 @@ class VPNService : android.net.VpnService() {
                 putOpt("deviceIpv4", mConfig?.getJSONObject("device")?.getString("ipv4Address"))
             }
         }
+
     /*
     * Checks if the VPN Permission is given.
     * If the permission is given, returns true
@@ -237,6 +239,7 @@ class VPNService : android.net.VpnService() {
         mOpenVPNThreadv3 = null
         Log.e(tag, "mOpenVPNThreadv3 stop!")
     }
+
     /**
      * Configures an Android VPN Service Tunnel
      * with a given Wireguard Config
@@ -296,7 +299,8 @@ class VPNService : android.net.VpnService() {
                     currentSection?.let {
                         parseData.put(it.first, it.second)
                     }
-                        currentSection = line.substring(1, line.indexOfLast { it == ']' }) to mutableMapOf()
+                    currentSection =
+                        line.substring(1, line.indexOfLast { it == ']' }) to mutableMapOf()
                 } else {
                     val parameter = line.split("=", limit = 2)
                     currentSection!!.second.put(parameter.first().trim(), parameter.last().trim())
@@ -401,6 +405,7 @@ class VPNService : android.net.VpnService() {
 
         NotificationUtil.show(this) // Go foreground
     }
+
     companion object {
         @JvmStatic
         fun startService(c: Context) {
@@ -412,14 +417,19 @@ class VPNService : android.net.VpnService() {
 
         @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?
     }

client/client.pro

@@ -1,4 +1,4 @@
-QT += widgets core gui network xml remoteobjects quick
+QT += widgets core gui network xml remoteobjects quick svg
 
 TARGET = AmneziaVPN
 TEMPLATE = app

client/ui/pages_logic/QrDecoderLogic.cpp

@@ -38,8 +38,6 @@ void QrDecoderLogic::onDetectedQrCode(const QString &code)
 
 
     if (magic == amnezia::qrMagicCode) {
-        qDebug() << "QrDecoderLogic::onDetectedQrCode magic code detected" << magic << ba.size();
-
         quint8 chunksCount; s >> chunksCount;
         if (totalChunksCount() != chunksCount) {
             m_chunks.clear();

client/ui/qml/Controls/SettingButtonType.qml

@@ -12,6 +12,7 @@ BasicButtonType {
             anchors.left: parent.left
             anchors.verticalCenter: parent.verticalCenter
             svg.source: root.icon.source
+            color: "#100A44"
             width: 25
             height: 25
         }

client/ui/uilogic.cpp

@@ -112,6 +112,7 @@ UiLogic::~UiLogic()
 {
     emit hide();
 
+#ifdef AMNEZIA_DESKTOP
     if (m_vpnConnection->connectionState() != VpnProtocol::VpnConnectionState::Disconnected) {
         m_vpnConnection->disconnectFromVpn();
         for (int i = 0; i < 50; i++) {
@@ -122,6 +123,7 @@ UiLogic::~UiLogic()
             }
         }
     }
+#endif
 
     m_vpnConnection->deleteLater();
     m_vpnConnectionThread.quit();