added generation of psk_key on api request

2026-05-30 23:31:14 +03:00 · 2024-10-08 17:55:09 +08:00
70 changed files with 327 additions and 1203 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -16,10 +16,7 @@ jobs:
      QT_VERSION: 6.6.2
      QIF_VERSION: 4.7
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}

    steps:
    - name: 'Install Qt'
@@ -86,10 +83,7 @@ jobs:
      QIF_VERSION: 4.7
      BUILD_ARCH: 64
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}

    steps:
    - name: 'Get sources'
@@ -152,10 +146,7 @@ jobs:
      CC: cc
      CXX: c++
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}

    steps:
    - name: 'Setup xcode'
@@ -247,10 +238,7 @@ jobs:
      QT_VERSION: 6.4.3
      QIF_VERSION: 4.6
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}

    steps:
    - name: 'Setup xcode'
@@ -313,13 +301,10 @@ jobs:

    env:
      ANDROID_BUILD_PLATFORM: android-34
-      QT_VERSION: 6.7.3
+      QT_VERSION: 6.7.2
      QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}

    steps:
    - name: 'Install desktop Qt'
@@ -418,13 +403,13 @@ jobs:
        ANDROID_KEYSTORE_KEY_ALIAS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_ALIAS }}
        ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_PASS }}
      shell: bash
-      run: ./deploy/build_android.sh --aab --play --apk all --build-platform ${{ env.ANDROID_BUILD_PLATFORM }}
+      run: ./deploy/build_android.sh --aab --apk all --build-platform ${{ env.ANDROID_BUILD_PLATFORM }}

    - name: 'Upload x86_64 apk'
      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN-android-x86_64
-        path: deploy/build/AmneziaVPN-oss-x86_64-release.apk
+        path: deploy/build/AmneziaVPN-x86_64-release.apk
        compression-level: 0
        retention-days: 7

@@ -432,7 +417,7 @@ jobs:
      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN-android-x86
-        path: deploy/build/AmneziaVPN-oss-x86-release.apk
+        path: deploy/build/AmneziaVPN-x86-release.apk
        compression-level: 0
        retention-days: 7

@@ -440,7 +425,7 @@ jobs:
      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN-android-arm64-v8a
-        path: deploy/build/AmneziaVPN-oss-arm64-v8a-release.apk
+        path: deploy/build/AmneziaVPN-arm64-v8a-release.apk
        compression-level: 0
        retention-days: 7

@@ -448,7 +433,7 @@ jobs:
      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN-android-armeabi-v7a
-        path: deploy/build/AmneziaVPN-oss-armeabi-v7a-release.apk
+        path: deploy/build/AmneziaVPN-armeabi-v7a-release.apk
        compression-level: 0
        retention-days: 7

@@ -456,7 +441,7 @@ jobs:
      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN-android
-        path: deploy/build/AmneziaVPN-play-release.aab
+        path: deploy/build/AmneziaVPN-release.aab
        compression-level: 0
        retention-days: 7

--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -16,10 +16,7 @@ jobs:
      QT_VERSION: 6.4.1
      QIF_VERSION: 4.5
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}

    steps:
    - name: 'Install desktop Qt'
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)

 set(PROJECT AmneziaVPN)

-project(${PROJECT} VERSION 4.8.2.3
+project(${PROJECT} VERSION 4.8.1.9
        DESCRIPTION "AmneziaVPN"
        HOMEPAGE_URL "https://amnezia.org/"
 )
@@ -11,7 +11,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")

 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 2069)
+set(APP_ANDROID_VERSION_CODE 65)

 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
    set(MZ_PLATFORM_NAME "linux")
--- a/README.md
+++ b/README.md
@@ -10,17 +10,21 @@ Amnezia is an open-source VPN client, with a key feature that enables you to dep

 <br>

-<a href="https://amnezia.org/downloads"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download.png" width="150" style="max-width: 100%;"></a>
+<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.7.0.0/AmneziaVPN_4.7.0.0_x64.exe"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/win.png" width="150" style="max-width: 100%;"></a> 
+<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.7.0.0/AmneziaVPN_4.7.0.0.dmg"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/mac.png" width="150" style="max-width: 100%;"></a> 
+<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.7.0.0/AmneziaVPN_Linux_4.7.0.0.tar.zip"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/lin.png" width="150" style="max-width: 100%;"></a>
+<a href="https://github.com/amnezia-vpn/amnezia-client/releases/tag/4.7.0.0"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/andr.png" width="150" style="max-width: 100%;"></a>
+
+<br>
+
 <a href="https://play.google.com/store/search?q=amnezia+vpn&c=apps"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/play.png" width="150" style="max-width: 100%;"></a>
 <a href="https://apps.apple.com/us/app/amneziavpn/id1600529900"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/apl.png" width="150" style="max-width: 100%;"></a>

-[Alternative download link (mirror)](https://storage.googleapis.com/kldscp/amnezia.org/downloads)

 [All releases](https://github.com/amnezia-vpn/amnezia-client/releases)

 <br>

-<a href="https://www.testiny.io"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/testiny.png" height="28px"></a>

 ## Features

@@ -33,7 +37,7 @@ Amnezia is an open-source VPN client, with a key feature that enables you to dep

 ## Links

- [https://amnezia.org](https://amnezia.org) - project website | [Alternative link (mirror)](https://storage.googleapis.com/kldscp/amnezia.org)
+- [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_ir](https://t.me/amnezia_vpn_ir) - Telegram support channel (Farsi) 
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -25,11 +25,10 @@ execute_process(
 add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")

 add_definitions(-DPROD_AGW_PUBLIC_KEY="$ENV{PROD_AGW_PUBLIC_KEY}")
-add_definitions(-DPROD_S3_ENDPOINT="$ENV{PROD_S3_ENDPOINT}")
+add_definitions(-DPROD_PROXY_STORAGE_KEY="$ENV{PROD_PROXY_STORAGE_KEY}")

 add_definitions(-DDEV_AGW_PUBLIC_KEY="$ENV{DEV_AGW_PUBLIC_KEY}")
 add_definitions(-DDEV_AGW_ENDPOINT="$ENV{DEV_AGW_ENDPOINT}")
-add_definitions(-DDEV_S3_ENDPOINT="$ENV{DEV_S3_ENDPOINT}")

 if(IOS)
    set(PACKAGES ${PACKAGES} Multimedia)
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -111,11 +111,10 @@ void AmneziaApplication::init()
        qFatal("Android controller initialization failed");
    }

-    connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, this, [this](QString data) {
-        emit m_pageController->goToPageHome();
+    connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, [this](QString data) {
+        m_pageController->goToPageHome();
        m_importController->extractConfigFromData(data);
-        data.clear();
-        emit m_pageController->goToPageViewConfig();
+        m_pageController->goToPageViewConfig();
    });

    m_engine->addImageProvider(QLatin1String("installedAppImage"), new InstalledAppsImageProvider);
@@ -123,16 +122,16 @@ void AmneziaApplication::init()

 #ifdef Q_OS_IOS
    IosController::Instance()->initialize();
-    connect(IosController::Instance(), &IosController::importConfigFromOutside, this, [this](QString data) {
-        emit m_pageController->goToPageHome();
+    connect(IosController::Instance(), &IosController::importConfigFromOutside, [this](QString data) {
+        m_pageController->goToPageHome();
        m_importController->extractConfigFromData(data);
-        emit m_pageController->goToPageViewConfig();
+        m_pageController->goToPageViewConfig();
    });

-    connect(IosController::Instance(), &IosController::importBackupFromOutside, this, [this](QString filePath) {
-        emit m_pageController->goToPageHome();
+    connect(IosController::Instance(), &IosController::importBackupFromOutside, [this](QString filePath) {
+        m_pageController->goToPageHome();
        m_pageController->goToPageSettingsBackup();
-        emit m_settingsController->importBackupFromOutside(filePath);
+        m_settingsController->importBackupFromOutside(filePath);
    });

    QTimer::singleShot(0, this, [this]() { AmneziaVPN::toggleScreenshots(m_settings->isScreenshotsEnabled()); });
--- a/client/android/billing/build.gradle.kts
+++ b/client/android/billing/build.gradle.kts
@@ -1,19 +0,0 @@
-plugins {
-    id(libs.plugins.android.library.get().pluginId)
-    id(libs.plugins.kotlin.android.get().pluginId)
-}
-
-kotlin {
-    jvmToolchain(17)
-}
-
-android {
-    namespace = "org.amnezia.vpn.billing"
-}
-
-dependencies {
-    compileOnly(project(":utils"))
-    implementation(libs.androidx.core)
-    implementation(libs.kotlinx.coroutines)
-    implementation(libs.android.billing)
-}
--- a/client/android/billing/src/main/kotlin/BillingException.kt
+++ b/client/android/billing/src/main/kotlin/BillingException.kt
@@ -1,65 +0,0 @@
-import com.android.billingclient.api.BillingClient.BillingResponseCode.BILLING_UNAVAILABLE
-import com.android.billingclient.api.BillingClient.BillingResponseCode.DEVELOPER_ERROR
-import com.android.billingclient.api.BillingClient.BillingResponseCode.ERROR
-import com.android.billingclient.api.BillingClient.BillingResponseCode.FEATURE_NOT_SUPPORTED
-import com.android.billingclient.api.BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED
-import com.android.billingclient.api.BillingClient.BillingResponseCode.ITEM_NOT_OWNED
-import com.android.billingclient.api.BillingClient.BillingResponseCode.ITEM_UNAVAILABLE
-import com.android.billingclient.api.BillingClient.BillingResponseCode.NETWORK_ERROR
-import com.android.billingclient.api.BillingClient.BillingResponseCode.SERVICE_DISCONNECTED
-import com.android.billingclient.api.BillingClient.BillingResponseCode.SERVICE_UNAVAILABLE
-import com.android.billingclient.api.BillingClient.BillingResponseCode.USER_CANCELED
-import com.android.billingclient.api.BillingResult
-import org.amnezia.vpn.util.ErrorCode
-
-internal class BillingException(
-    billingResult: BillingResult,
-    retryable: Boolean = false
-) : Exception(billingResult.toString()) {
-
-    constructor(msg: String) : this(BillingResult.newBuilder()
-        .setResponseCode(DEVELOPER_ERROR)
-        .setDebugMessage(msg)
-        .build())
-
-    val errorCode: Int
-    val isCanceled = billingResult.responseCode == USER_CANCELED
-    val isRetryable = retryable || billingResult.responseCode in setOf(
-        NETWORK_ERROR,
-        SERVICE_DISCONNECTED,
-        SERVICE_UNAVAILABLE,
-        ERROR
-    )
-
-    init {
-        when (billingResult.responseCode) {
-            ERROR -> {
-                errorCode = ErrorCode.BillingGooglePlayError
-            }
-
-            BILLING_UNAVAILABLE, SERVICE_DISCONNECTED, SERVICE_UNAVAILABLE -> {
-                errorCode = ErrorCode.BillingUnavailable
-            }
-
-            DEVELOPER_ERROR, FEATURE_NOT_SUPPORTED, ITEM_NOT_OWNED -> {
-                errorCode = ErrorCode.BillingError
-            }
-
-            ITEM_ALREADY_OWNED -> {
-                errorCode = ErrorCode.SubscriptionAlreadyOwned
-            }
-
-            ITEM_UNAVAILABLE -> {
-                errorCode = ErrorCode.SubscriptionUnavailable
-            }
-
-            NETWORK_ERROR -> {
-                errorCode = ErrorCode.BillingNetworkError
-            }
-
-            else -> {
-                errorCode = ErrorCode.BillingError
-            }
-        }
-    }
-}
--- a/client/android/billing/src/main/kotlin/BillingProvider.kt
+++ b/client/android/billing/src/main/kotlin/BillingProvider.kt
@@ -1,320 +0,0 @@
-import android.app.Activity
-import android.content.Context
-import com.android.billingclient.api.AcknowledgePurchaseParams
-import com.android.billingclient.api.BillingClient
-import com.android.billingclient.api.BillingClient.BillingResponseCode
-import com.android.billingclient.api.BillingClient.ProductType
-import com.android.billingclient.api.BillingClientStateListener
-import com.android.billingclient.api.BillingFlowParams
-import com.android.billingclient.api.BillingFlowParams.SubscriptionUpdateParams.ReplacementMode
-import com.android.billingclient.api.BillingResult
-import com.android.billingclient.api.GetBillingConfigParams
-import com.android.billingclient.api.PendingPurchasesParams
-import com.android.billingclient.api.ProductDetails
-import com.android.billingclient.api.Purchase
-import com.android.billingclient.api.PurchasesUpdatedListener
-import com.android.billingclient.api.QueryProductDetailsParams
-import com.android.billingclient.api.QueryProductDetailsParams.Product
-import com.android.billingclient.api.QueryPurchasesParams
-import com.android.billingclient.api.acknowledgePurchase
-import com.android.billingclient.api.queryProductDetails
-import com.android.billingclient.api.queryPurchasesAsync
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.withContext
-import org.amnezia.vpn.util.ErrorCode
-import org.amnezia.vpn.util.Log
-import org.json.JSONArray
-import org.json.JSONObject
-
-private const val TAG = "BillingProvider"
-private const val PRODUCT_ID = "premium"
-
-class BillingProvider(context: Context) : AutoCloseable {
-
-    private var billingClient: BillingClient
-    private var subscriptionPurchases = MutableStateFlow<Pair<BillingResult, List<Purchase>?>?>(null)
-
-    private val purchasesUpdatedListeners = PurchasesUpdatedListener { billingResult, purchases ->
-        Log.v(TAG, "Purchases updated: $billingResult")
-        subscriptionPurchases.value = billingResult to purchases
-    }
-
-    init {
-        billingClient = BillingClient.newBuilder(context)
-            .setListener(purchasesUpdatedListeners)
-            .enablePendingPurchases(PendingPurchasesParams.newBuilder().enableOneTimeProducts().build())
-            .build()
-    }
-
-    private suspend fun connect() {
-        if (billingClient.isReady) return
-
-        Log.v(TAG, "Billing client connection")
-        val connection = CompletableDeferred<Unit>()
-        withContext(Dispatchers.IO) {
-            billingClient.startConnection(object : BillingClientStateListener {
-                override fun onBillingSetupFinished(billingResult: BillingResult) {
-                    Log.v(TAG, "Billing setup finished: $billingResult")
-                    if (billingResult.isOk) {
-                        connection.complete(Unit)
-                    } else {
-                        Log.e(TAG, "Billing setup failed: $billingResult")
-                        connection.completeExceptionally(BillingException(billingResult))
-                    }
-                }
-
-                override fun onBillingServiceDisconnected() {
-                    Log.w(TAG, "Billing service disconnected")
-                }
-            })
-        }
-        connection.await()
-    }
-
-    private suspend fun handleBillingApiCall(block: suspend () -> JSONObject): JSONObject {
-        val numberAttempts = 3
-        var attemptCount = 0
-        while (true) {
-            try {
-                return block()
-            } catch (e: BillingException) {
-                if (e.isCanceled) {
-                    Log.w(TAG, "Billing canceled")
-                    return JSONObject().put("responseCode", ErrorCode.BillingCanceled)
-                } else if (e.isRetryable && attemptCount < numberAttempts) {
-                    Log.d(TAG, "Retryable error: $e")
-                    ++attemptCount
-                    delay(1000)
-                } else {
-                    Log.e(TAG, "Billing error: $e")
-                    return JSONObject().put("responseCode", e.errorCode)
-                }
-            } catch (_: CancellationException) {
-                Log.w(TAG, "Billing coroutine canceled")
-                return JSONObject().put("responseCode", ErrorCode.BillingCanceled)
-            }
-        }
-    }
-
-    suspend fun getSubscriptionPlans(): JSONObject {
-        Log.v(TAG, "Get subscription plans")
-
-        val productDetailsList = getProductDetails()
-        val resultJson = JSONObject().put("responseCode", ErrorCode.NoError)
-        val productArray = JSONArray().also { resultJson.put("products", it) }
-        productDetailsList?.forEach { productDetails ->
-            val product = JSONObject().also { productArray.put(it) }
-                .put("productId", productDetails.productId)
-                .put("name", productDetails.name)
-            val offers = JSONArray().also { product.put("offers", it) }
-            productDetails.subscriptionOfferDetails?.forEach { offerDetails ->
-                val offer = JSONObject().also { offers.put(it) }
-                    .put("basePlanId", offerDetails.basePlanId)
-                    .put("offerId", offerDetails.offerId)
-                    .put("offerToken", offerDetails.offerToken)
-                val pricingPhases = JSONArray().also { offer.put("pricingPhases", it) }
-                offerDetails.pricingPhases.pricingPhaseList.forEach { phase ->
-                    JSONObject().also { pricingPhases.put(it) }
-                        .put("billingCycleCount", phase.billingCycleCount)
-                        .put("billingPeriod", phase.billingPeriod)
-                        .put("formatedPrice", phase.formattedPrice)
-                        .put("recurrenceMode", phase.recurrenceMode)
-                }
-            }
-        }
-        return resultJson
-    }
-
-    private suspend fun getProductDetails(): List<ProductDetails>? {
-        Log.v(TAG, "Get product details")
-
-        val productDetailsParams = Product.newBuilder()
-            .setProductId(PRODUCT_ID)
-            .setProductType(ProductType.SUBS)
-            .build()
-
-        val queryProductDetailsParams = QueryProductDetailsParams.newBuilder()
-            .setProductList(listOf(productDetailsParams))
-            .build()
-
-        val result = withContext(Dispatchers.IO) {
-            billingClient.queryProductDetails(queryProductDetailsParams)
-        }
-
-        Log.v(TAG, "Query product details result: ${result.billingResult}")
-
-        if (!result.billingResult.isOk) {
-            Log.e(TAG, "Failed to get product details: ${result.billingResult}")
-            throw BillingException(result.billingResult)
-        }
-
-        return result.productDetailsList
-    }
-
-    suspend fun getCustomerCountryCode(): JSONObject {
-        Log.v(TAG, "Get customer country code")
-
-        val deferred = CompletableDeferred<String>()
-        withContext(Dispatchers.IO) {
-            billingClient.getBillingConfigAsync(GetBillingConfigParams.newBuilder().build(),
-                { billingResult, billingConfig ->
-                    Log.v(TAG, "Billing config: $billingResult, ${billingConfig?.countryCode}")
-                    if (billingResult.isOk) {
-                        deferred.complete(billingConfig?.countryCode ?: "")
-                    } else {
-                        deferred.completeExceptionally(BillingException(billingResult))
-                    }
-                })
-        }
-        val countryCode = deferred.await()
-
-        return JSONObject()
-            .put("responseCode", ErrorCode.NoError)
-            .put("countryCode", countryCode)
-    }
-
-    suspend fun purchaseSubscription(
-        activity: Activity,
-        offerToken: String,
-        oldPurchaseToken: String? = null
-    ): JSONObject {
-        Log.v(TAG, "Purchase subscription")
-        Log.v(TAG, "Offer token: $offerToken")
-        oldPurchaseToken?.let { Log.v(TAG, "Old purchase token: $it") }
-
-        if (offerToken.isBlank()) throw BillingException("offerToken can not be empty")
-
-        val productDetails = getProductDetails()?.let {
-            it.filter { it.productId == PRODUCT_ID }
-        }?.firstOrNull() ?: throw BillingException("Product details not found")
-
-        Log.v(TAG, "Filtered product details:\n$productDetails")
-
-        val productDetail = BillingFlowParams.ProductDetailsParams.newBuilder()
-            .setProductDetails(productDetails)
-            .setOfferToken(offerToken)
-            .build()
-
-        val subscriptionUpdateParams = oldPurchaseToken?.let {
-            BillingFlowParams.SubscriptionUpdateParams.newBuilder()
-                .setOldPurchaseToken(oldPurchaseToken)
-                .setSubscriptionReplacementMode(ReplacementMode.WITHOUT_PRORATION)
-                .build()
-        }
-
-        val billingResult = billingClient.launchBillingFlow(activity, BillingFlowParams.newBuilder()
-            .setProductDetailsParamsList(listOf(productDetail))
-            .apply { subscriptionUpdateParams?.let { setSubscriptionUpdateParams(it) } }
-            .build())
-
-        Log.v(TAG, "Start billing flow result: $billingResult")
-
-        if (billingResult.responseCode == BillingResponseCode.ITEM_ALREADY_OWNED) {
-            Log.w(TAG, "Attempting to purchase already owned product")
-            val purchases = queryPurchases()
-            if (purchases.any { PRODUCT_ID in it.products }) throw BillingException(billingResult)
-            else throw BillingException(billingResult, retryable = true)
-        } else if (billingResult.responseCode == BillingResponseCode.ITEM_NOT_OWNED) {
-            Log.w(TAG, "Attempting to replace not owned product")
-            val purchases = queryPurchases()
-            if (purchases.all { PRODUCT_ID !in it.products }) throw BillingException(billingResult)
-            else throw BillingException(billingResult, retryable = true)
-        } else if (!billingResult.isOk) throw BillingException(billingResult)
-
-        subscriptionPurchases.firstOrNull { it != null }?.let { (billingResult, purchases) ->
-            if (!billingResult.isOk) throw BillingException(billingResult)
-            return JSONObject()
-                .put("responseCode", ErrorCode.NoError)
-                .put("purchases", processPurchases(purchases))
-        } ?: throw BillingException("Purchase failed")
-    }
-
-    private fun processPurchases(purchases: List<Purchase>?): JSONArray {
-        val purchaseArray = JSONArray()
-        purchases?.forEach { purchase ->
-            /* val purchaseJson = */ JSONObject().also { purchaseArray.put(it) }
-                .put("purchaseToken", purchase.purchaseToken)
-                .put("purchaseTime", purchase.purchaseTime)
-                .put("purchaseState", purchase.purchaseState)
-                .put("isAcknowledged", purchase.isAcknowledged)
-                .put("isAutoRenewing", purchase.isAutoRenewing)
-                .put("orderId", purchase.orderId)
-                // .put("productIds", JSONArray(purchase.products))
-
-            /* purchase.pendingPurchaseUpdate?.let { purchaseUpdate ->
-                JSONObject()
-                    .put("purchaseToken", purchaseUpdate.purchaseToken)
-                    // .put("productIds", JSONArray(purchaseUpdate.products))
-            }.also { purchaseJson.put("pendingPurchaseUpdate", it) } */
-        }
-        return purchaseArray
-    }
-
-    suspend fun acknowledge(purchaseToken: String): JSONObject {
-        Log.v(TAG, "Acknowledge purchase: $purchaseToken")
-
-        val result = withContext(Dispatchers.IO) {
-            billingClient.acknowledgePurchase(
-                AcknowledgePurchaseParams.newBuilder()
-                    .setPurchaseToken(purchaseToken)
-                    .build()
-            )
-        }
-
-        Log.v(TAG, "Acknowledge purchase result: $result")
-
-        if (result.responseCode == BillingResponseCode.ITEM_NOT_OWNED) {
-            Log.w(TAG, "Attempting to acknowledge not owned product")
-            val purchases = queryPurchases()
-            if (purchases.all { PRODUCT_ID !in it.products }) throw BillingException(result)
-            else throw BillingException(result, retryable = true)
-        } else if (!result.isOk && result.responseCode != BillingResponseCode.ITEM_ALREADY_OWNED) {
-            throw BillingException(result)
-        }
-
-        return JSONObject().put("responseCode", ErrorCode.NoError)
-    }
-
-    suspend fun getPurchases(): JSONObject {
-        Log.v(TAG, "Get purchases")
-        val purchases = queryPurchases()
-        return JSONObject()
-            .put("responseCode", ErrorCode.NoError)
-            .put("purchases", processPurchases(purchases))
-    }
-
-    private suspend fun queryPurchases(): List<Purchase> {
-        Log.v(TAG, "Query purchases")
-        val result = withContext(Dispatchers.IO) {
-            billingClient.queryPurchasesAsync(
-                QueryPurchasesParams.newBuilder().setProductType(ProductType.SUBS).build()
-            )
-        }
-        Log.v(TAG, "Query purchases result: ${result.billingResult}")
-        if (!result.billingResult.isOk) throw BillingException(result.billingResult)
-        return result.purchasesList
-    }
-
-    override fun close() {
-        Log.v(TAG, "Close billing client connection")
-        billingClient.endConnection()
-    }
-
-    companion object {
-        suspend fun withBillingProvider(context: Context, block: suspend BillingProvider.() -> JSONObject): String =
-            BillingProvider(context).use { bp ->
-                bp.handleBillingApiCall {
-                    bp.connect()
-                    bp.block()
-                }.toString()
-            }
-    }
-}
-
-internal val BillingResult.isOk: Boolean
-    get() = responseCode == BillingResponseCode.OK
--- a/client/android/build.gradle.kts
+++ b/client/android/build.gradle.kts
@@ -20,7 +20,6 @@ android {
    namespace = "org.amnezia.vpn"

    buildFeatures {
-        buildConfig = true
        viewBinding = true
    }

@@ -42,6 +41,17 @@ android {
        resourceConfigurations += listOf("en", "ru", "b+zh+Hans")
    }

+    sourceSets {
+        getByName("main") {
+            manifest.srcFile("AndroidManifest.xml")
+            java.setSrcDirs(listOf("src"))
+            res.setSrcDirs(listOf("res"))
+            // androyddeployqt creates the folders below
+            assets.setSrcDirs(listOf("assets"))
+            jniLibs.setSrcDirs(listOf("libs"))
+        }
+    }
+
    signingConfigs {
        register("release") {
            storeFile = providers.environmentVariable("ANDROID_KEYSTORE_PATH").orNull?.let { file(it) }
@@ -67,36 +77,6 @@ android {
        }
    }

-    flavorDimensions += "billing"
-
-    productFlavors {
-        create("oss") {
-            dimension = "billing"
-        }
-        create("play") {
-            dimension = "billing"
-        }
-    }
-
-    sourceSets {
-        getByName("main") {
-            manifest.srcFile("AndroidManifest.xml")
-            java.setSrcDirs(listOf("src"))
-            res.setSrcDirs(listOf("res"))
-            // androyddeployqt creates the folders below
-            assets.setSrcDirs(listOf("assets"))
-            jniLibs.setSrcDirs(listOf("libs"))
-        }
-
-        getByName("oss") {
-            java.setSrcDirs(listOf("oss"))
-        }
-
-        getByName("play") {
-            java.setSrcDirs(listOf("play"))
-        }
-    }
-
    splits {
        abi {
            isEnable = true
@@ -142,9 +122,4 @@ dependencies {
    implementation(libs.google.mlkit)
    implementation(libs.androidx.datastore)
    implementation(libs.androidx.biometric)
-
-    playImplementation(project(":billing"))
 }
-
-fun DependencyHandler.playImplementation(dependency: Any): Dependency? =
-    add("playImplementation", dependency)
--- a/client/android/gradle.properties
+++ b/client/android/gradle.properties
@@ -33,7 +33,7 @@ android.library.defaults.buildfeatures.androidresources=false
 # For development copy and set local values for these parameters in local.properties
 #androidCompileSdkVersion=android-34
 #androidBuildToolsVersion=34.0.0
-#qtMinSdkVersion=26
+#qtMinSdkVersion=24
 #qtTargetSdkVersion=34
 #androidNdkVersion=26.1.10909125
 #qtTargetAbiList=x86_64
--- a/client/android/gradle/libs.versions.toml
+++ b/client/android/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 agp = "8.5.2"
 kotlin = "1.9.24"
-android-billing = "7.0.0"
 androidx-core = "1.13.1"
 androidx-activity = "1.9.1"
 androidx-annotation = "1.8.2"
@@ -15,7 +14,6 @@ kotlinx-serialization = "1.6.3"
 google-mlkit = "17.3.0"

 [libraries]
-android-billing = { module = "com.android.billingclient:billing-ktx", version.ref = "android-billing" }
 androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
 androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
--- a/client/android/oss/org/amnezia/vpn/BillingPaymentRepository.kt
+++ b/client/android/oss/org/amnezia/vpn/BillingPaymentRepository.kt
@@ -1,13 +0,0 @@
-package org.amnezia.vpn
-
-import android.app.Activity
-import android.content.Context
-
-class BillingPaymentRepository(@Suppress("UNUSED_PARAMETER") context: Context) : BillingRepository {
-    override suspend fun getCountryCode(): String = ""
-    override suspend fun getSubscriptionPlans(): String = ""
-    override suspend fun purchaseSubscription(activity: Activity, offerToken: String): String = ""
-    override suspend fun upgradeSubscription(activity: Activity, offerToken: String, oldPurchaseToken: String): String = ""
-    override suspend fun acknowledge(purchaseToken: String): String = ""
-    override suspend fun queryPurchases(): String = ""
-}
--- a/client/android/play/org/amnezia/vpn/BillingPaymentRepository.kt
+++ b/client/android/play/org/amnezia/vpn/BillingPaymentRepository.kt
@@ -1,34 +0,0 @@
-package org.amnezia.vpn
-
-import android.app.Activity
-import android.content.Context
-import BillingProvider.Companion.withBillingProvider
-
-class BillingPaymentRepository(private val context: Context) : BillingRepository {
-
-    override suspend fun getCountryCode(): String = withBillingProvider(context) {
-        getCustomerCountryCode()
-    }
-
-    override suspend fun getSubscriptionPlans(): String = withBillingProvider(context) {
-        getSubscriptionPlans()
-    }
-
-    override suspend fun purchaseSubscription(activity: Activity, offerToken: String): String =
-        withBillingProvider(context) {
-            purchaseSubscription(activity, offerToken)
-    }
-
-    override suspend fun upgradeSubscription(activity: Activity, offerToken: String, oldPurchaseToken: String): String =
-        withBillingProvider(context) {
-            purchaseSubscription(activity, offerToken, oldPurchaseToken)
-        }
-
-    override suspend fun acknowledge(purchaseToken: String): String = withBillingProvider(context) {
-        acknowledge(purchaseToken)
-    }
-
-    override suspend fun queryPurchases(): String = withBillingProvider(context) {
-        getPurchases()
-    }
-}
--- a/client/android/protocolApi/src/main/kotlin/Protocol.kt
+++ b/client/android/protocolApi/src/main/kotlin/Protocol.kt
@@ -1,5 +1,6 @@
 package org.amnezia.vpn.protocol

+import android.annotation.SuppressLint
 import android.content.Context
 import android.net.IpPrefix
 import android.net.VpnService
@@ -7,6 +8,9 @@ import android.net.VpnService.Builder
 import android.os.Build
 import android.system.OsConstants
 import androidx.annotation.RequiresApi
+import java.io.File
+import java.io.FileOutputStream
+import java.util.zip.ZipFile
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.amnezia.vpn.util.Log
 import org.amnezia.vpn.util.net.InetNetwork
--- a/client/android/settings.gradle.kts
+++ b/client/android/settings.gradle.kts
@@ -31,7 +31,6 @@ rootProject.buildFileName = "build.gradle.kts"

 include(":qt")
 include(":utils")
-include(":billing")
 include(":protocolApi")
 include(":wireguard")
 include(":awg")
--- a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
@@ -21,7 +21,6 @@ import android.os.Looper
 import android.os.Message
 import android.os.Messenger
 import android.provider.Settings
-import android.view.MotionEvent
 import android.view.WindowManager.LayoutParams
 import android.webkit.MimeTypeMap
 import android.widget.Toast
@@ -30,7 +29,6 @@ import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import java.io.IOException
 import kotlin.LazyThreadSafetyMode.NONE
-import kotlin.coroutines.CoroutineContext
 import kotlin.text.RegexOption.IGNORE_CASE
 import AppListProvider
 import kotlinx.coroutines.CompletableDeferred
@@ -41,6 +39,7 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import org.amnezia.vpn.protocol.getStatistics
 import org.amnezia.vpn.protocol.getStatus
 import org.amnezia.vpn.qt.QtAndroidController
@@ -71,7 +70,6 @@ class AmneziaActivity : QtActivity() {
    private var isInBoundState = false
    private var notificationStateReceiver: BroadcastReceiver? = null
    private lateinit var vpnServiceMessenger: IpcMessenger
-    private lateinit var billingRepository: BillingRepository

    private val actionResultHandlers = mutableMapOf<Int, ActivityResultHandler>()
    private val permissionRequestHandlers = mutableMapOf<Int, PermissionRequestHandler>()
@@ -160,7 +158,7 @@ class AmneziaActivity : QtActivity() {
     */
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        Log.d(TAG, "Create Amnezia activity")
+        Log.d(TAG, "Create Amnezia activity: $intent")
        loadLibs()
        window.apply {
            addFlags(LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
@@ -181,7 +179,6 @@ class AmneziaActivity : QtActivity() {
        registerBroadcastReceivers()
        intent?.let(::processIntent)
        runBlocking { vpnProto = proto.await() }
-        billingRepository = BillingPaymentRepository(applicationContext)
    }

    private fun loadLibs() {
@@ -203,7 +200,7 @@ class AmneziaActivity : QtActivity() {
                    NotificationManager.ACTION_APP_BLOCK_STATE_CHANGED
                )
            ) {
-                Log.v(
+                Log.d(
                    TAG, "Notification state changed: ${it?.action}, blocked = " +
                        "${it?.getBooleanExtra(NotificationManager.EXTRA_BLOCKED_STATE, false)}"
                )
@@ -217,7 +214,7 @@ class AmneziaActivity : QtActivity() {

    override fun onNewIntent(intent: Intent?) {
        super.onNewIntent(intent)
-        Log.v(TAG, "onNewIntent: $intent")
+        Log.d(TAG, "onNewIntent: $intent")
        intent?.let(::processIntent)
    }

@@ -406,7 +403,7 @@ class AmneziaActivity : QtActivity() {
    @MainThread
    private fun startVpn(vpnConfig: String) {
        getVpnProto(vpnConfig)?.let { proto ->
-            Log.v(TAG, "Proto from config: $proto, current proto: $vpnProto")
+            Log.d(TAG, "Proto from config: $proto, current proto: $vpnProto")
            if (isServiceConnected) {
                if (proto.serviceClass == vpnProto?.serviceClass) {
                    vpnProto = proto
@@ -519,7 +516,7 @@ class AmneziaActivity : QtActivity() {
                startActivityForResult(it, CREATE_FILE_ACTION_CODE, ActivityResultHandler(
                    onSuccess = {
                        it?.data?.let { uri ->
-                            Log.v(TAG, "Save file to $uri")
+                            Log.d(TAG, "Save file to $uri")
                            try {
                                contentResolver.openOutputStream(uri)?.use { os ->
                                    os.bufferedWriter().use { it.write(data) }
@@ -568,7 +565,7 @@ class AmneziaActivity : QtActivity() {
                startActivityForResult(it, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
                    onAny = {
                        val uri = it?.data?.toString() ?: ""
-                        Log.v(TAG, "Open file: $uri")
+                        Log.d(TAG, "Open file: $uri")
                        mainScope.launch {
                            qtInitialized.await()
                            QtAndroidController.onFileOpened(uri)
@@ -649,9 +646,15 @@ class AmneziaActivity : QtActivity() {
    @Suppress("unused")
    fun getAppList(): String {
        Log.v(TAG, "Get app list")
-        return blockingCall(Dispatchers.IO) {
-            AppListProvider.getAppList(packageManager, packageName)
+        var appList = ""
+        runBlocking {
+            mainScope.launch {
+                withContext(Dispatchers.IO) {
+                    appList = AppListProvider.getAppList(packageManager, packageName)
+                }
+            }.join()
        }
+        return appList
    }

    @Suppress("unused")
@@ -717,117 +720,9 @@ class AmneziaActivity : QtActivity() {
        }
    }

-    @Suppress("unused")
-    fun isPlay(): Boolean = BuildConfig.FLAVOR == "play"
-
-    @Suppress("unused")
-    fun getCountryCode(): String {
-        Log.v(TAG, "Get country code")
-        return blockingCall { billingRepository.getCountryCode() }
-    }
-
-    @Suppress("unused")
-    fun getSubscriptionPlans(): String {
-        Log.v(TAG, "Get subscription plans")
-        return blockingCall { billingRepository.getSubscriptionPlans() }
-    }
-
-    @Suppress("unused")
-    fun purchaseSubscription(offerToken: String): String {
-        Log.v(TAG, "Purchase subscription")
-        return blockingCall { billingRepository.purchaseSubscription(this@AmneziaActivity, offerToken) }
-    }
-
-    @Suppress("unused")
-    fun upgradeSubscription(offerToken: String, oldPurchaseToken: String): String {
-        Log.v(TAG, "Upgrade subscription")
-        return blockingCall {
-            billingRepository.upgradeSubscription(this@AmneziaActivity, offerToken, oldPurchaseToken)
-        }
-    }
-
-    @Suppress("unused")
-    fun acknowledgePurchase(purchaseToken: String): String {
-        Log.v(TAG, "Acknowledge purchase")
-        return blockingCall { billingRepository.acknowledge(purchaseToken) }
-    }
-
-    @Suppress("unused")
-    fun queryPurchases(): String {
-        Log.v(TAG, "Query purchases")
-        return blockingCall { billingRepository.queryPurchases() }
-    }
-
-    // workaround for a bug in Qt that causes the mouse click event not to be handled
-    // also disable right-click, as it causes the application to crash
-    private var lastButtonState = 0
-    private fun MotionEvent.fixCopy(): MotionEvent = MotionEvent.obtain(
-        downTime,
-        eventTime,
-        action,
-        pointerCount,
-        (0 until pointerCount).map { i ->
-            MotionEvent.PointerProperties().apply {
-                getPointerProperties(i, this)
-            }
-        }.toTypedArray(),
-        (0 until pointerCount).map { i ->
-            MotionEvent.PointerCoords().apply {
-                getPointerCoords(i, this)
-            }
-        }.toTypedArray(),
-        metaState,
-        MotionEvent.BUTTON_PRIMARY,
-        xPrecision,
-        yPrecision,
-        deviceId,
-        edgeFlags,
-        source,
-        flags
-    )
-
-    private fun handleMouseEvent(ev: MotionEvent, superDispatch: (MotionEvent?) -> Boolean): Boolean {
-        when (ev.action) {
-            MotionEvent.ACTION_DOWN -> {
-                lastButtonState = ev.buttonState
-                if (ev.buttonState == MotionEvent.BUTTON_SECONDARY) return true
-            }
-
-            MotionEvent.ACTION_UP -> {
-                when (lastButtonState) {
-                    MotionEvent.BUTTON_SECONDARY -> return true
-                    MotionEvent.BUTTON_PRIMARY -> {
-                        val modEvent = ev.fixCopy()
-                        return superDispatch(modEvent).apply { modEvent.recycle() }
-                    }
-                }
-            }
-        }
-        return superDispatch(ev)
-    }
-
-    override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
-        if (ev != null && ev.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE) {
-            return handleMouseEvent(ev) { super.dispatchTouchEvent(it) }
-        }
-        return super.dispatchTouchEvent(ev)
-    }
-
-    override fun dispatchTrackballEvent(ev: MotionEvent?): Boolean {
-        ev?.let { return handleMouseEvent(ev) { super.dispatchTrackballEvent(it) }}
-        return super.dispatchTrackballEvent(ev)
-    }
-
    /**
     * Utils methods
     */
-    private fun <T> blockingCall(
-        context: CoroutineContext = Dispatchers.Default,
-        block: suspend () -> T
-    ) = runBlocking {
-        mainScope.async(context) { block() }.await()
-    }
-
    companion object {
        private fun actionCodeToString(actionCode: Int): String =
            when (actionCode) {
--- a/client/android/src/org/amnezia/vpn/AmneziaApplication.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaApplication.kt
@@ -1,6 +1,5 @@
 package org.amnezia.vpn

-import android.system.Os
 import androidx.camera.camera2.Camera2Config
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.CameraXConfig
@@ -13,9 +12,6 @@ private const val TAG = "AmneziaApplication"
 class AmneziaApplication : QtApplication(), CameraXConfig.Provider {

    override fun onCreate() {
-        if (BuildConfig.DEBUG) {
-            Os.setenv("QT_ANDROID_DEBUGGER_MAIN_THREAD_SLEEP_MS", "0", true)
-        }
        super.onCreate()
        Prefs.init(this)
        Log.init(this)
--- a/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt
@@ -300,7 +300,7 @@ open class AmneziaVpnService : VpnService() {
            arrayOf(ACTION_CONNECT, ACTION_DISCONNECT), ContextCompat.RECEIVER_NOT_EXPORTED
        ) {
            it?.action?.let { action ->
-                Log.v(TAG, "Broadcast request received: $action")
+                Log.d(TAG, "Broadcast request received: $action")
                when (action) {
                    ACTION_CONNECT -> connect()
                    ACTION_DISCONNECT -> disconnect()
@@ -317,7 +317,7 @@ open class AmneziaVpnService : VpnService() {
                )
            ) {
                val state = it?.getBooleanExtra(NotificationManager.EXTRA_BLOCKED_STATE, false)
-                Log.v(TAG, "Notification state changed: ${it?.action}, blocked = $state")
+                Log.d(TAG, "Notification state changed: ${it?.action}, blocked = $state")
                if (state == false) {
                    enableNotification()
                } else {
@@ -450,7 +450,7 @@ open class AmneziaVpnService : VpnService() {
            serviceNotification.isNotificationEnabled() &&
            getSystemService<PowerManager>()?.isInteractive != false
        ) {
-            Log.v(TAG, "Launch traffic stats update")
+            Log.d(TAG, "Launch traffic stats update")
            trafficStats.reset()
            startTrafficStatsUpdateJob()
        }
--- a/client/android/src/org/amnezia/vpn/AuthActivity.kt
+++ b/client/android/src/org/amnezia/vpn/AuthActivity.kt
@@ -66,7 +66,7 @@ class AuthActivity : FragmentActivity() {
            object : BiometricPrompt.AuthenticationCallback() {
                override fun onAuthenticationSucceeded(result: AuthenticationResult) {
                    super.onAuthenticationSucceeded(result)
-                    Log.v(TAG, "Authentication succeeded")
+                    Log.d(TAG, "Authentication succeeded")
                    QtAndroidController.onAuthResult(true)
                    finish()
                }
--- a/client/android/src/org/amnezia/vpn/BillingRepository.kt
+++ b/client/android/src/org/amnezia/vpn/BillingRepository.kt
@@ -1,12 +0,0 @@
-package org.amnezia.vpn
-
-import android.app.Activity
-
-interface BillingRepository {
-    suspend fun getCountryCode(): String
-    suspend fun getSubscriptionPlans(): String
-    suspend fun purchaseSubscription(activity: Activity, offerToken: String): String
-    suspend fun upgradeSubscription(activity: Activity, offerToken: String, oldPurchaseToken: String): String
-    suspend fun acknowledge(purchaseToken: String): String
-    suspend fun queryPurchases(): String
-}
--- a/client/android/src/org/amnezia/vpn/ImportConfigActivity.kt
+++ b/client/android/src/org/amnezia/vpn/ImportConfigActivity.kt
@@ -29,20 +29,20 @@ class ImportConfigActivity : ComponentActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        Log.v(TAG, "Create Import Config Activity: $intent")
+        Log.d(TAG, "Create Import Config Activity: $intent")
        intent?.let(::readConfig)
    }

    override fun onNewIntent(intent: Intent) {
        super.onNewIntent(intent)
-        Log.v(TAG, "onNewIntent: $intent")
+        Log.d(TAG, "onNewIntent: $intent")
        intent.let(::readConfig)
    }

    private fun readConfig(intent: Intent) {
        when (intent.action) {
            ACTION_SEND -> {
-                Log.v(TAG, "Process SEND action, type: ${intent.type}")
+                Log.d(TAG, "Process SEND action, type: ${intent.type}")
                when (intent.type) {
                    "application/octet-stream" -> {
                        intent.getUriCompat()?.let { uri ->
@@ -60,7 +60,7 @@ class ImportConfigActivity : ComponentActivity() {
            }

            ACTION_VIEW -> {
-                Log.v(TAG, "Process VIEW action, scheme: ${intent.scheme}")
+                Log.d(TAG, "Process VIEW action, scheme: ${intent.scheme}")
                when (intent.scheme) {
                    "file", "content" -> {
                        intent.data?.let { uri ->
--- a/client/android/src/org/amnezia/vpn/ServiceNotification.kt
+++ b/client/android/src/org/amnezia/vpn/ServiceNotification.kt
@@ -62,7 +62,7 @@ class ServiceNotification(private val context: Context) {
    fun buildNotification(serverName: String?, protocol: String?, state: ProtocolState): Notification {
        val speedString = if (state == CONNECTED) zeroSpeed else null

-        Log.v(TAG, "Build notification: $serverName, $state")
+        Log.d(TAG, "Build notification: $serverName, $state")

        return notificationBuilder
            .setSmallIcon(R.drawable.ic_amnezia_round)
@@ -88,15 +88,17 @@ class ServiceNotification(private val context: Context) {
    fun isNotificationEnabled(): Boolean {
        if (!context.isNotificationPermissionGranted()) return false
        if (!notificationManager.areNotificationsEnabled()) return false
-        return notificationManager.getNotificationChannel(NOTIFICATION_CHANNEL_ID)?.let {
-            it.importance != NotificationManager.IMPORTANCE_NONE
-        } ?: true
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            return notificationManager.getNotificationChannel(NOTIFICATION_CHANNEL_ID)
+                ?.let { it.importance != NotificationManager.IMPORTANCE_NONE } ?: true
+        }
+        return true
    }

    @SuppressLint("MissingPermission")
    fun updateNotification(serverName: String?, protocol: String?, state: ProtocolState) {
        if (context.isNotificationPermissionGranted()) {
-            Log.v(TAG, "Update notification: $serverName, $state")
+            Log.d(TAG, "Update notification: $serverName, $state")
            notificationManager.notify(NOTIFICATION_ID, buildNotification(serverName, protocol, state))
        }
    }
--- a/client/android/utils/src/main/kotlin/ErrorCode.kt
+++ b/client/android/utils/src/main/kotlin/ErrorCode.kt
@@ -1,14 +0,0 @@
-package org.amnezia.vpn.util
-
-// keep synchronized with client/core/defs.h error_code_ns::ErrorCode
-object ErrorCode {
-    const val NoError = 0
-
-    const val BillingCanceled = 1300
-    const val BillingError = 1301
-    const val BillingGooglePlayError = 1302
-    const val BillingUnavailable = 1303
-    const val SubscriptionAlreadyOwned = 1304
-    const val SubscriptionUnavailable = 1305
-    const val BillingNetworkError = 1306
-}
--- a/client/android/utils/src/main/kotlin/LibraryLoader.kt
+++ b/client/android/utils/src/main/kotlin/LibraryLoader.kt
@@ -46,7 +46,7 @@ object LibraryLoader {
            System.loadLibrary(libraryName)
            return
        } catch (_: UnsatisfiedLinkError) {
-            Log.w(TAG, "Failed to load library, try to extract it from apk")
+            Log.d(TAG, "Failed to load library, try to extract it from apk")
        }
        var tempFile: File? = null
        try {
--- a/client/android/utils/src/main/kotlin/Log.kt
+++ b/client/android/utils/src/main/kotlin/Log.kt
@@ -1,6 +1,8 @@
 package org.amnezia.vpn.util

 import android.content.Context
+import android.icu.text.DateFormat
+import android.icu.text.SimpleDateFormat
 import android.os.Build
 import android.os.Process
 import java.io.File
@@ -10,6 +12,8 @@ import java.nio.channels.FileChannel
 import java.nio.channels.FileLock
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
+import java.util.Date
+import java.util.Locale
 import java.util.concurrent.locks.ReentrantLock
 import org.amnezia.vpn.util.Log.Priority.D
 import org.amnezia.vpn.util.Log.Priority.E
@@ -37,7 +41,11 @@ private const val LOG_MAX_FILE_SIZE = 1024 * 1024
 * |                   |              | create a report and/or terminate the process |
 */
 object Log {
-    private val dateTimeFormat: DateTimeFormatter = DateTimeFormatter.ofPattern(DATE_TIME_PATTERN)
+    private val dateTimeFormat: Any =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) DateTimeFormatter.ofPattern(DATE_TIME_PATTERN)
+        else object : ThreadLocal<DateFormat>() {
+            override fun initialValue(): DateFormat = SimpleDateFormat(DATE_TIME_PATTERN, Locale.US)
+        }

    private lateinit var logDir: File
    private val logFile: File by lazy { File(logDir, LOG_FILE_NAME) }
@@ -135,7 +143,12 @@ object Log {
    }

    private fun formatLogMsg(tag: String, msg: String, priority: Priority): String {
-        val date = LocalDateTime.now().format(dateTimeFormat)
+        val date = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            LocalDateTime.now().format(dateTimeFormat as DateTimeFormatter)
+        } else {
+            @Suppress("UNCHECKED_CAST")
+            (dateTimeFormat as ThreadLocal<DateFormat>).get()?.format(Date())
+        }
        return "$date ${Process.myPid()} ${Process.myTid()} $priority [${Thread.currentThread().name}] " +
            "$tag: $msg\n"
    }
--- a/client/android/utils/src/main/kotlin/net/NetworkState.kt
+++ b/client/android/utils/src/main/kotlin/net/NetworkState.kt
@@ -42,12 +42,18 @@ class NetworkState(
    private val networkCallback: NetworkCallback by lazy(NONE) {
        object : NetworkCallback() {
            override fun onAvailable(network: Network) {
-                Log.v(TAG, "onAvailable: $network")
+                Log.d(TAG, "onAvailable: $network")
            }

            override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-                Log.v(TAG, "onCapabilitiesChanged: $network, $networkCapabilities")
-                checkNetworkState(network, networkCapabilities)
+                Log.d(TAG, "onCapabilitiesChanged: $network, $networkCapabilities")
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    checkNetworkState(network, networkCapabilities)
+                } else {
+                    handler.post {
+                        checkNetworkState(network, networkCapabilities)
+                    }
+                }
            }

            private fun checkNetworkState(network: Network, networkCapabilities: NetworkCapabilities) {
@@ -67,11 +73,11 @@ class NetworkState(
            }

            override fun onBlockedStatusChanged(network: Network, blocked: Boolean) {
-                Log.v(TAG, "onBlockedStatusChanged: $network, $blocked")
+                Log.d(TAG, "onBlockedStatusChanged: $network, $blocked")
            }

            override fun onLost(network: Network) {
-                Log.v(TAG, "onLost: $network")
+                Log.d(TAG, "onLost: $network")
            }
        }
    }
@@ -81,7 +87,7 @@ class NetworkState(
        Log.d(TAG, "Bind network listener")
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
            connectivityManager.registerBestMatchingNetworkCallback(networkRequest, networkCallback, handler)
-        } else {
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            val numberAttempts = 300
            var attemptCount = 0
            while(true) {
@@ -102,6 +108,8 @@ class NetworkState(
                    }
                }
            }
+        } else {
+            connectivityManager.requestNetwork(networkRequest, networkCallback)
        }
        isListenerBound = true
    }
--- a/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt
+++ b/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt
@@ -66,7 +66,7 @@ open class Wireguard : Protocol() {
            try {
                delay(1000)
                var log = getLogcat(time)
-                Log.v(TAG, "First waiting log: $log")
+                Log.d(TAG, "First waiting log: $log")
                // check that there is a connection log,
                // to avoid infinite connection
                if (!log.contains("Attaching to interface")) {
--- a/client/android/xray/src/main/kotlin/Xray.kt
+++ b/client/android/xray/src/main/kotlin/Xray.kt
@@ -130,8 +130,8 @@ class Xray : Protocol() {
            LibXray.initXray(assetsPath)
            val geoDir = File(assetsPath, "geo").absolutePath
            val configPath = File(context.cacheDir, "config.json")
-            Log.v(TAG, "xray.location.asset: $geoDir")
-            Log.v(TAG, "config: $configPath")
+            Log.d(TAG, "xray.location.asset: $geoDir")
+            Log.d(TAG, "config: $configPath")
            try {
                configPath.writeText(configJson)
            } catch (e: IOException) {
--- a/client/cmake/android.cmake
+++ b/client/cmake/android.cmake
@@ -1,6 +1,6 @@
 message("Client android ${CMAKE_ANDROID_ARCH_ABI} build")

-set(APP_ANDROID_MIN_SDK 26)
+set(APP_ANDROID_MIN_SDK 24)
 set(ANDROID_PLATFORM "android-${APP_ANDROID_MIN_SDK}" CACHE STRING
    "The minimum API level supported by the application or library" FORCE)

--- a/client/core/controllers/apiController.cpp
+++ b/client/core/controllers/apiController.cpp
@@ -1,8 +1,5 @@
 #include "apiController.h"

-#include <algorithm>
-#include <random>
-
 #include <QEventLoop>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
@@ -14,7 +11,6 @@
 #include "amnezia_application.h"
 #include "configurators/wireguard_configurator.h"
 #include "core/enums/apiEnums.h"
-#include "utilities.h"
 #include "version.h"

 namespace
@@ -28,6 +24,7 @@ namespace
        constexpr char accessToken[] = "api_key";
        constexpr char certificate[] = "certificate";
        constexpr char publicKey[] = "public_key";
+        constexpr char pskKey[] = "preshared_key";
        constexpr char protocol[] = "protocol";

        constexpr char uuid[] = "installation_uuid";
@@ -37,7 +34,6 @@ namespace
        constexpr char userCountryCode[] = "user_country_code";
        constexpr char serverCountryCode[] = "server_country_code";
        constexpr char serviceType[] = "service_type";
-        constexpr char serviceInfo[] = "service_info";

        constexpr char aesKey[] = "aes_key";
        constexpr char aesIv[] = "aes_iv";
@@ -45,11 +41,10 @@ namespace

        constexpr char apiPayload[] = "api_payload";
        constexpr char keyPayload[] = "key_payload";
-
-        constexpr char apiConfig[] = "api_config";
-        constexpr char authData[] = "auth_data";
    }

+    const QStringList proxyStorageUrl = { "" };
+
    ErrorCode checkErrors(const QList<QSslError> &sslErrors, QNetworkReply *reply)
    {
        if (!sslErrors.empty()) {
@@ -69,28 +64,6 @@ namespace
            return ErrorCode::ApiConfigDownloadError;
        }
    }
-
-    bool shouldBypassProxy(QNetworkReply *reply, const QByteArray &responseBody, bool checkEncryption, const QByteArray &key = "",
-                           const QByteArray &iv = "", const QByteArray &salt = "")
-    {
-        if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError
-            || reply->error() == QNetworkReply::NetworkError::TimeoutError) {
-            qDebug() << "Timeout occurred";
-            return true;
-        } else if (responseBody.contains("html")) {
-            qDebug() << "The response contains an html tag";
-            return true;
-        } else if (checkEncryption) {
-            try {
-                QSimpleCrypto::QBlockCipher blockCipher;
-                static_cast<void>(blockCipher.decryptAesBlockCipher(responseBody, key, iv, "", salt));
-            } catch (...) {
-                qDebug() << "Failed to decrypt the data";
-                return true;
-            }
-        }
-        return false;
-    }
 }

 ApiController::ApiController(const QString &gatewayEndpoint, bool isDevEnvironment, QObject *parent)
@@ -122,8 +95,8 @@ void ApiController::fillServerConfig(const QString &protocol, const ApiControlle
        configStr.replace("$OPENVPN_PRIV_KEY", apiPayloadData.certRequest.privKey);
    } else if (protocol == configKey::awg) {
        configStr.replace("$WIREGUARD_CLIENT_PRIVATE_KEY", apiPayloadData.wireGuardClientPrivKey);
-        auto newServerConfig = QJsonDocument::fromJson(configStr.toUtf8()).object();
-        auto containers = newServerConfig.value(config_key::containers).toArray();
+        auto serverConfig = QJsonDocument::fromJson(configStr.toUtf8()).object();
+        auto containers = serverConfig.value(config_key::containers).toArray();
        if (containers.isEmpty()) {
            return; // todo process error
        }
@@ -142,35 +115,25 @@ void ApiController::fillServerConfig(const QString &protocol, const ApiControlle
        containerConfig[config_key::transportPacketMagicHeader] = protocolConfig.value(config_key::transportPacketMagicHeader);
        container[containerName] = containerConfig;
        containers.replace(0, container);
-        newServerConfig[config_key::containers] = containers;
-        configStr = QString(QJsonDocument(newServerConfig).toJson());
+        serverConfig[config_key::containers] = containers;
+        configStr = QString(QJsonDocument(serverConfig).toJson());
    }

-    QJsonObject newServerConfig = QJsonDocument::fromJson(configStr.toUtf8()).object();
-    serverConfig[config_key::dns1] = newServerConfig.value(config_key::dns1);
-    serverConfig[config_key::dns2] = newServerConfig.value(config_key::dns2);
-    serverConfig[config_key::containers] = newServerConfig.value(config_key::containers);
-    serverConfig[config_key::hostName] = newServerConfig.value(config_key::hostName);
+    QJsonObject apiConfig = QJsonDocument::fromJson(configStr.toUtf8()).object();
+    serverConfig[config_key::dns1] = apiConfig.value(config_key::dns1);
+    serverConfig[config_key::dns2] = apiConfig.value(config_key::dns2);
+    serverConfig[config_key::containers] = apiConfig.value(config_key::containers);
+    serverConfig[config_key::hostName] = apiConfig.value(config_key::hostName);

-    if (newServerConfig.value(config_key::configVersion).toInt() == ApiConfigSources::AmneziaGateway) {
-        serverConfig[config_key::configVersion] = newServerConfig.value(config_key::configVersion);
-        serverConfig[config_key::description] = newServerConfig.value(config_key::description);
-        serverConfig[config_key::name] = newServerConfig.value(config_key::name);
+    if (apiConfig.value(config_key::configVersion).toInt() == ApiConfigSources::AmneziaGateway) {
+        serverConfig[config_key::configVersion] = apiConfig.value(config_key::configVersion);
+        serverConfig[config_key::description] = apiConfig.value(config_key::description);
+        serverConfig[config_key::name] = apiConfig.value(config_key::name);
    }

-    auto defaultContainer = newServerConfig.value(config_key::defaultContainer).toString();
+    auto defaultContainer = apiConfig.value(config_key::defaultContainer).toString();
    serverConfig[config_key::defaultContainer] = defaultContainer;

-    QVariantMap map = serverConfig.value(configKey::apiConfig).toObject().toVariantMap();
-    map.insert(newServerConfig.value(configKey::apiConfig).toObject().toVariantMap());
-    auto apiConfig = QJsonObject::fromVariantMap(map);
-
-    if (newServerConfig.value(config_key::configVersion).toInt() == ApiConfigSources::AmneziaGateway) {
-        apiConfig.insert(configKey::serviceInfo, QJsonDocument::fromJson(apiResponseBody).object().value(configKey::serviceInfo).toObject());
-    }
-
-    serverConfig[configKey::apiConfig] = apiConfig;
-
    return;
 }

@@ -184,15 +147,6 @@ QStringList ApiController::getProxyUrls()
    QList<QSslError> sslErrors;
    QNetworkReply *reply;

-    QStringList proxyStorageUrl;
-    if (m_isDevEnvironment) {
-        proxyStorageUrl = QStringList { DEV_S3_ENDPOINT };
-    } else {
-        proxyStorageUrl = QStringList { PROD_S3_ENDPOINT };
-    }
-
-    QByteArray key = m_isDevEnvironment ? DEV_AGW_PUBLIC_KEY : PROD_AGW_PUBLIC_KEY;
-
    for (const auto &proxyStorageUrl : proxyStorageUrl) {
        request.setUrl(proxyStorageUrl);
        reply = amnApp->manager()->get(request);
@@ -213,23 +167,11 @@ QStringList ApiController::getProxyUrls()
    EVP_PKEY *privateKey = nullptr;
    QByteArray responseBody;
    try {
-        if (!m_isDevEnvironment) {
-            QCryptographicHash hash(QCryptographicHash::Sha512);
-            hash.addData(key);
-            QByteArray hashResult = hash.result().toHex();
-
-            QByteArray key = QByteArray::fromHex(hashResult.left(64));
-            QByteArray iv = QByteArray::fromHex(hashResult.mid(64, 32));
-
-            QByteArray ba = QByteArray::fromBase64(encryptedResponseBody);
-
-            QSimpleCrypto::QBlockCipher blockCipher;
-            responseBody = blockCipher.decryptAesBlockCipher(ba, key, iv);
-        } else {
-            responseBody = encryptedResponseBody;
-        }
+        QByteArray key = PROD_PROXY_STORAGE_KEY;
+        QSimpleCrypto::QRsa rsa;
+        privateKey = rsa.getPrivateKeyFromByteArray(key, "");
+        responseBody = rsa.decrypt(encryptedResponseBody, privateKey, RSA_PKCS1_PADDING);
    } catch (...) {
-        Utils::logException();
        qCritical() << "error loading private key from environment variables or decrypting payload";
        return {};
    }
@@ -252,6 +194,12 @@ ApiController::ApiPayloadData ApiController::generateApiPayloadData(const QStrin
        auto connData = WireguardConfigurator::genClientKeys();
        apiPayload.wireGuardClientPubKey = connData.clientPubKey;
        apiPayload.wireGuardClientPrivKey = connData.clientPrivKey;
+        QSimpleCrypto::QBlockCipher blockCipher;
+        apiPayload.wireGuardPskKey = blockCipher.generatePrivateSalt(32);
+
+        qDebug() << apiPayload.wireGuardClientPubKey;
+        qDebug() << apiPayload.wireGuardPskKey;
+
    }
    return apiPayload;
 }
@@ -263,6 +211,7 @@ QJsonObject ApiController::fillApiPayload(const QString &protocol, const ApiCont
        obj[configKey::certificate] = apiPayloadData.certRequest.request;
    } else if (protocol == configKey::awg) {
        obj[configKey::publicKey] = apiPayloadData.wireGuardClientPubKey;
+        obj[configKey::pskKey] = apiPayloadData.wireGuardPskKey;
    }

    obj[configKey::osVersion] = QSysInfo::productType();
@@ -351,44 +300,38 @@ ErrorCode ApiController::getServicesList(QByteArray &responseBody)
    connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
    wait.exec();

-    responseBody = reply->readAll();
-
-    if (sslErrors.isEmpty() && shouldBypassProxy(reply, responseBody, false)) {
+    if (reply->error() == QNetworkReply::NetworkError::TimeoutError || reply->error() == QNetworkReply::NetworkError::OperationCanceledError) {
        m_proxyUrls = getProxyUrls();
-        std::random_device randomDevice;
-        std::mt19937 generator(randomDevice());
-        std::shuffle(m_proxyUrls.begin(), m_proxyUrls.end(), generator);
        for (const QString &proxyUrl : m_proxyUrls) {
-            qDebug() << "Go to the next endpoint";
            request.setUrl(QString("%1v1/services").arg(proxyUrl));
-            reply->deleteLater(); // delete the previous reply
            reply = amnApp->manager()->get(request);

            QObject::connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
            connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
            wait.exec();
-
-            responseBody = reply->readAll();
-            if (!sslErrors.isEmpty() || !shouldBypassProxy(reply, responseBody, false)) {
+            if (reply->error() != QNetworkReply::NetworkError::TimeoutError
+                && reply->error() != QNetworkReply::NetworkError::OperationCanceledError) {
                break;
            }
+            reply->deleteLater();
        }
    }

+    responseBody = reply->readAll();
    auto errorCode = checkErrors(sslErrors, reply);
    reply->deleteLater();
    return errorCode;
 }

 ErrorCode ApiController::getConfigForService(const QString &installationUuid, const QString &userCountryCode, const QString &serviceType,
-                                             const QString &protocol, const QString &serverCountryCode, const QJsonObject &authData,
-                                             QJsonObject &serverConfig)
+                                             const QString &protocol, const QString &serverCountryCode, QJsonObject &serverConfig)
 {
 #ifdef Q_OS_IOS
    IosController::Instance()->requestInetAccess();
    QThread::msleep(10);
 #endif

+    QNetworkAccessManager manager;
    QNetworkRequest request;
    request.setTransferTimeout(7000);
    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
@@ -404,9 +347,6 @@ ErrorCode ApiController::getConfigForService(const QString &installationUuid, co
    }
    apiPayload[configKey::serviceType] = serviceType;
    apiPayload[configKey::uuid] = installationUuid;
-    if (!authData.isEmpty()) {
-        apiPayload[configKey::authData] = authData;
-    }

    QSimpleCrypto::QBlockCipher blockCipher;
    QByteArray key = blockCipher.generatePrivateSalt(32);
@@ -429,7 +369,6 @@ ErrorCode ApiController::getConfigForService(const QString &installationUuid, co
            QSimpleCrypto::QRsa rsa;
            publicKey = rsa.getPublicKeyFromByteArray(rsaKey);
        } catch (...) {
-            Utils::logException();
            qCritical() << "error loading public key from environment variables";
            return ErrorCode::ApiMissingAgwPublicKey;
        }
@@ -439,16 +378,14 @@ ErrorCode ApiController::getConfigForService(const QString &installationUuid, co

        encryptedApiPayload = blockCipher.encryptAesBlockCipher(QJsonDocument(apiPayload).toJson(), key, iv, "", salt);
    } catch (...) { // todo change error handling in QSimpleCrypto?
-        Utils::logException();
        qCritical() << "error when encrypting the request body";
-        return ErrorCode::ApiConfigDecryptionError;
    }

    QJsonObject requestBody;
    requestBody[configKey::keyPayload] = QString(encryptedKeyPayload.toBase64());
    requestBody[configKey::apiPayload] = QString(encryptedApiPayload.toBase64());

-    QNetworkReply *reply = amnApp->manager()->post(request, QJsonDocument(requestBody).toJson());
+    QNetworkReply *reply = manager.post(request, QJsonDocument(requestBody).toJson());

    QEventLoop wait;
    connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
@@ -457,43 +394,37 @@ ErrorCode ApiController::getConfigForService(const QString &installationUuid, co
    connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
    wait.exec();

-    auto encryptedResponseBody = reply->readAll();
-
-    if (sslErrors.isEmpty() && shouldBypassProxy(reply, encryptedResponseBody, true, key, iv, salt)) {
-        m_proxyUrls = getProxyUrls();
-        std::random_device randomDevice;
-        std::mt19937 generator(randomDevice());
-        std::shuffle(m_proxyUrls.begin(), m_proxyUrls.end(), generator);
+    if (reply->error() == QNetworkReply::NetworkError::TimeoutError || reply->error() == QNetworkReply::NetworkError::OperationCanceledError) {
+        if (m_proxyUrls.isEmpty()) {
+            m_proxyUrls = getProxyUrls();
+        }
        for (const QString &proxyUrl : m_proxyUrls) {
-            qDebug() << "Go to the next endpoint";
            request.setUrl(QString("%1v1/config").arg(proxyUrl));
-            reply->deleteLater(); // delete the previous reply
-            reply = amnApp->manager()->post(request, QJsonDocument(requestBody).toJson());
+            reply = manager.post(request, QJsonDocument(requestBody).toJson());

            QObject::connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
            connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
            wait.exec();
-
-            encryptedResponseBody = reply->readAll();
-            if (!sslErrors.isEmpty() || !shouldBypassProxy(reply, encryptedResponseBody, true, key, iv, salt)) {
+            if (reply->error() != QNetworkReply::NetworkError::TimeoutError
+                && reply->error() != QNetworkReply::NetworkError::OperationCanceledError) {
                break;
            }
+            reply->deleteLater();
        }
    }

    auto errorCode = checkErrors(sslErrors, reply);
-    reply->deleteLater();
    if (errorCode) {
        return errorCode;
    }

+    auto encryptedResponseBody = reply->readAll();
+    reply->deleteLater();
    try {
        auto responseBody = blockCipher.decryptAesBlockCipher(encryptedResponseBody, key, iv, "", salt);
        fillServerConfig(protocol, apiPayloadData, responseBody, serverConfig);
    } catch (...) { // todo change error handling in QSimpleCrypto?
-        Utils::logException();
        qCritical() << "error when decrypting the request body";
-        return ErrorCode::ApiConfigDecryptionError;
    }

    return errorCode;
--- a/client/core/controllers/apiController.h
+++ b/client/core/controllers/apiController.h
@@ -21,7 +21,7 @@ public slots:

    ErrorCode getServicesList(QByteArray &responseBody);
    ErrorCode getConfigForService(const QString &installationUuid, const QString &userCountryCode, const QString &serviceType,
-                                  const QString &protocol, const QString &serverCountryCode, const QJsonObject &authData, QJsonObject &serverConfig);
+                                  const QString &protocol, const QString &serverCountryCode, QJsonObject &serverConfig);

 signals:
    void errorOccurred(ErrorCode errorCode);
@@ -34,6 +34,7 @@ private:

        QString wireGuardClientPrivKey;
        QString wireGuardClientPubKey;
+        QString wireGuardPskKey;
    };

    ApiPayloadData generateApiPayloadData(const QString &protocol);
--- a/client/core/defs.h
+++ b/client/core/defs.h
@@ -96,7 +96,6 @@ namespace amnezia

        // import and install errors
        ImportInvalidConfigError = 900,
-        ImportOpenConfigError = 901,

        // Android errors
        AndroidError = 1000,
@@ -108,7 +107,6 @@ namespace amnezia
        ApiConfigTimeoutError = 1103,
        ApiConfigSslError = 1104,
        ApiMissingAgwPublicKey = 1105,
-        ApiConfigDecryptionError = 1106,

        // QFile errors
        OpenError = 1200,
@@ -116,16 +114,7 @@ namespace amnezia
        PermissionsError = 1202,
        UnspecifiedError = 1203,
        FatalError = 1204,
-        AbortError = 1205,
-
-        // Billing errors
-        BillingCanceled = 1300,
-        BillingError = 1301,
-        BillingGooglePlayError = 1302,
-        BillingUnavailable = 1303,
-        SubscriptionAlreadyOwned = 1304,
-        SubscriptionUnavailable = 1305,
-        BillingNetworkError = 1306,
+        AbortError = 1205
      };
      Q_ENUM_NS(ErrorCode)
    }
--- a/client/core/errorstrings.cpp
+++ b/client/core/errorstrings.cpp
@@ -50,7 +50,6 @@ QString errorString(ErrorCode code) {
    case (ErrorCode::AddressPoolError): errorMessage = QObject::tr("VPN pool error: no available addresses"); break;

    case (ErrorCode::ImportInvalidConfigError): errorMessage = QObject::tr("The config does not contain any containers and credentials for connecting to the server"); break;
-    case (ErrorCode::ImportOpenConfigError): errorMessage = QObject::tr("Unable to open config file"); break;

    // Android errors
    case (ErrorCode::AndroidError): errorMessage = QObject::tr("VPN connection error"); break;
@@ -62,7 +61,6 @@ QString errorString(ErrorCode code) {
    case (ErrorCode::ApiConfigSslError): errorMessage = QObject::tr("SSL error occurred"); break;
    case (ErrorCode::ApiConfigTimeoutError): errorMessage = QObject::tr("Server response timeout on api request"); break;
    case (ErrorCode::ApiMissingAgwPublicKey): errorMessage = QObject::tr("Missing AGW public key"); break;
-    case (ErrorCode::ApiConfigDecryptionError): errorMessage = QObject::tr("Failed to decrypt response payload"); break;
      
    // QFile errors
    case(ErrorCode::OpenError): errorMessage = QObject::tr("QFile error: The file could not be opened"); break;
@@ -72,15 +70,6 @@ QString errorString(ErrorCode code) {
    case(ErrorCode::FatalError): errorMessage =  QObject::tr("QFile error: A fatal error occurred"); break;
    case(ErrorCode::AbortError): errorMessage =  QObject::tr("QFile error: The operation was aborted"); break;

-    // Billing errors
-    case(ErrorCode::BillingCanceled): errorMessage = QObject::tr("Transaction was canceled by the user"); break;
-    case(ErrorCode::BillingError): errorMessage = QObject::tr("Billing error"); break;
-    case(ErrorCode::BillingGooglePlayError): errorMessage = QObject::tr("Internal Google Play error, please try again later"); break;
-    case(ErrorCode::BillingUnavailable): errorMessage = QObject::tr("Billing is unavailable, please try again later"); break;
-    case(ErrorCode::SubscriptionAlreadyOwned): errorMessage = QObject::tr("You already own this subscription"); break;
-    case(ErrorCode::SubscriptionUnavailable): errorMessage = QObject::tr("The requested subscription is not available for purchase"); break;
-    case(ErrorCode::BillingNetworkError): errorMessage = QObject::tr("A network error occurred during the operation, please check the Internet connection"); break;
-
    case(ErrorCode::InternalError):
    default:
        errorMessage = QObject::tr("Internal error"); break;
--- a/client/daemon/daemon.cpp
+++ b/client/daemon/daemon.cpp
@@ -78,7 +78,7 @@ bool Daemon::activate(const InterfaceConfig& config) {
        return false;
      }

-      if (!dnsutils()->restoreResolvers()) {
+      if (supportDnsUtils() && !dnsutils()->restoreResolvers()) {
        return false;
      }

@@ -165,6 +165,10 @@ bool Daemon::activate(const InterfaceConfig& config) {
 }

 bool Daemon::maybeUpdateResolvers(const InterfaceConfig& config) {
+  if (!supportDnsUtils()) {
+    return true;
+  }
+
  if ((config.m_hopType == InterfaceConfig::MultiHopExit) ||
      (config.m_hopType == InterfaceConfig::SingleHop)) {
    QList<QHostAddress> resolvers;
@@ -419,8 +423,13 @@ bool Daemon::deactivate(bool emitSignals) {
  }

  // Cleanup DNS
-  if (!dnsutils()->restoreResolvers()) {
-    logger.warning() << "Failed to restore DNS resolvers.";
+  if (supportDnsUtils() && !dnsutils()->restoreResolvers()) {
+    return false;
+  }
+
+  if (!wgutils()->interfaceExists()) {
+    logger.warning() << "Wireguard interface does not exist.";
+    return false;
  }

  // Cleanup peers and routing
@@ -440,9 +449,13 @@ bool Daemon::deactivate(bool emitSignals) {
  }
  m_excludedAddrSet.clear();

-  m_connections.clear();
  // Delete the interface
-  return wgutils()->deleteInterface();  
+  if (!wgutils()->deleteInterface()) {
+    return false;
+  }
+
+  m_connections.clear();
+  return true;
 }

 QString Daemon::logs() {
--- a/client/daemon/daemon.h
+++ b/client/daemon/daemon.h
@@ -69,6 +69,7 @@ class Daemon : public QObject {
  virtual WireguardUtils* wgutils() const = 0;
  virtual bool supportIPUtils() const { return false; }
  virtual IPUtils* iputils() { return nullptr; }
+  virtual bool supportDnsUtils() const { return false; }
  virtual DnsUtils* dnsutils() { return nullptr; }

  static bool parseStringList(const QJsonObject& obj, const QString& name,
--- a/client/daemon/daemonlocalserverconnection.cpp
+++ b/client/daemon/daemonlocalserverconnection.cpp
@@ -92,17 +92,6 @@ void DaemonLocalServerConnection::parseCommand(const QByteArray& data) {

  logger.debug() << "Command received:" << type;

-  // It is expected that sometimes the client will request backend logs
-  // before the first authentication. In these cases we just return empty
-  // logs.
-  if (type == "logs") {
-    QJsonObject obj;
-    obj.insert("type", "logs");
-    obj.insert("logs", "");
-    write(obj);
-    return;
-  }
-
  if (type == "activate") {
    InterfaceConfig config;
    if (!Daemon::parseConfig(obj, config)) {
@@ -126,7 +115,8 @@ void DaemonLocalServerConnection::parseCommand(const QByteArray& data) {
  if (type == "status") {
    QJsonObject obj = Daemon::instance()->getStatus();
    obj.insert("type", "status");
-    write(obj);
+    m_socket->write(QJsonDocument(obj).toJson(QJsonDocument::Compact));
+    m_socket->write("\n");
    return;
  }

@@ -134,7 +124,8 @@ void DaemonLocalServerConnection::parseCommand(const QByteArray& data) {
    QJsonObject obj;
    obj.insert("type", "logs");
    obj.insert("logs", Daemon::instance()->logs().replace("\n", "|"));
-    write(obj);
+    m_socket->write(QJsonDocument(obj).toJson(QJsonDocument::Compact));
+    m_socket->write("\n");
    return;
  }

--- a/client/mozilla/localsocketcontroller.cpp
+++ b/client/mozilla/localsocketcontroller.cpp
@@ -34,8 +34,8 @@ LocalSocketController::LocalSocketController() {
  m_socket = new QLocalSocket(this);
  connect(m_socket, &QLocalSocket::connected, this,
          &LocalSocketController::daemonConnected);
-  connect(m_socket, &QLocalSocket::disconnected, this, 
-          [&] { errorOccurred(QLocalSocket::PeerClosedError); });
+  connect(m_socket, &QLocalSocket::disconnected, this,
+          &LocalSocketController::disconnected);
  connect(m_socket, &QLocalSocket::errorOccurred, this,
          &LocalSocketController::errorOccurred);
  connect(m_socket, &QLocalSocket::readyRead, this,
--- a/client/platforms/android/android_controller.cpp
+++ b/client/platforms/android/android_controller.cpp
@@ -287,51 +287,6 @@ bool AndroidController::requestAuthentication()
    return result;
 }

-bool AndroidController::isPlay()
-{
-    return callActivityMethod<jboolean>("isPlay", "()Z");
-}
-
-QJsonObject AndroidController::getSubscriptionPlans()
-{
-    QJniObject subscriptionPlans = callActivityMethod<jstring>("getSubscriptionPlans", "()Ljava/lang/String;");
-    QJsonObject json = QJsonDocument::fromJson(subscriptionPlans.toString().toUtf8()).object();
-    return json;
-}
-
-QJsonObject AndroidController::purchaseSubscription(const QString &offerToken)
-{
-    QJniObject result = callActivityMethod<jstring, jstring>("purchaseSubscription", "(Ljava/lang/String;)Ljava/lang/String;",
-                                                    QJniObject::fromString(offerToken).object<jstring>());
-    QJsonObject json = QJsonDocument::fromJson(result.toString().toUtf8()).object();
-    return json;
-}
-
-QJsonObject AndroidController::upgradeSubscription(const QString &offerToken, const QString &oldPurchaseToken)
-{
-    QJniObject result = callActivityMethod<jstring, jstring, jstring>("upgradeSubscription",
-                                                                      "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
-                                                                      QJniObject::fromString(offerToken).object<jstring>(),
-                                                                      QJniObject::fromString(oldPurchaseToken).object<jstring>());
-    QJsonObject json = QJsonDocument::fromJson(result.toString().toUtf8()).object();
-    return json;
-}
-
-QJsonObject AndroidController::acknowledgePurchase(const QString &purchaseToken)
-{
-    QJniObject result = callActivityMethod<jstring, jstring>("acknowledgePurchase", "(Ljava/lang/String;)Ljava/lang/String;",
-                                                             QJniObject::fromString(purchaseToken).object<jstring>());
-    QJsonObject json = QJsonDocument::fromJson(result.toString().toUtf8()).object();
-    return json;
-}
-
-QJsonObject AndroidController::queryPurchases()
-{
-    QJniObject result = callActivityMethod<jstring>("queryPurchases", "()Ljava/lang/String;");
-    QJsonObject json = QJsonDocument::fromJson(result.toString().toUtf8()).object();
-    return json;
-}
-
 // Moving log processing to the Android side
 jclass AndroidController::log;
 jmethodID AndroidController::logDebug;
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@@ -48,12 +48,6 @@ public:
    bool isNotificationPermissionGranted();
    void requestNotificationPermission();
    bool requestAuthentication();
-    bool isPlay();
-    QJsonObject getSubscriptionPlans();
-    QJsonObject purchaseSubscription(const QString &offerToken);
-    QJsonObject upgradeSubscription(const QString &offerToken, const QString &oldPurchaseToken);
-    QJsonObject acknowledgePurchase(const QString &purchaseToken);
-    QJsonObject queryPurchases();

    static bool initLogging();
    static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);
--- a/client/platforms/linux/daemon/linuxdaemon.h
+++ b/client/platforms/linux/daemon/linuxdaemon.h
@@ -22,6 +22,7 @@ class LinuxDaemon final : public Daemon {

 protected:
  WireguardUtils* wgutils() const override { return m_wgutils; }
+  bool supportDnsUtils() const override { return true; }
  DnsUtils* dnsutils() override { return m_dnsutils; }
  bool supportIPUtils() const override { return true; }
  IPUtils* iputils() override { return m_iputils; }
--- a/client/platforms/macos/daemon/macosdaemon.h
+++ b/client/platforms/macos/daemon/macosdaemon.h
@@ -21,6 +21,7 @@ class MacOSDaemon final : public Daemon {

 protected:
  WireguardUtils* wgutils() const override { return m_wgutils; }
+  bool supportDnsUtils() const override { return true; }
  DnsUtils* dnsutils() override { return m_dnsutils; }
  bool supportIPUtils() const override { return true; }
  IPUtils* iputils() override { return m_iputils; }
--- a/client/platforms/windows/daemon/windowsdaemon.h
+++ b/client/platforms/windows/daemon/windowsdaemon.h
@@ -26,6 +26,7 @@ class WindowsDaemon final : public Daemon {
 protected:
  bool run(Op op, const InterfaceConfig& config) override;
  WireguardUtils* wgutils() const override { return m_wgutils; }
+  bool supportDnsUtils() const override { return true; }
  DnsUtils* dnsutils() override { return m_dnsutils; }

 private:
--- a/client/platforms/windows/daemon/windowssplittunnel.cpp
+++ b/client/platforms/windows/daemon/windowssplittunnel.cpp
@@ -502,7 +502,7 @@ QString WindowsSplitTunnel::convertPath(const QString& path) {
    // device should contain : for e.g C:
    return "";
  }
-  QByteArray buffer(2048, 0xFFu);
+  QByteArray buffer(2048, 0xFF);
  auto ok = QueryDosDeviceW(qUtf16Printable(driveLetter),
                            (wchar_t*)buffer.data(), buffer.size() / 2);

--- a/client/platforms/windows/daemon/wireguardutilswindows.cpp
+++ b/client/platforms/windows/daemon/wireguardutilswindows.cpp
@@ -248,7 +248,7 @@ bool WireguardUtilsWindows::updateRoutePrefix(const IPAddress& prefix) {
  }
  if (result != NO_ERROR) {
    logger.error() << "Failed to create route to"
-                   << prefix.toString()
+                   << logger.sensitive(prefix.toString())
                   << "result:" << result;
  }
  return result == NO_ERROR;
@@ -265,7 +265,7 @@ bool WireguardUtilsWindows::deleteRoutePrefix(const IPAddress& prefix) {
  }
  if (result != NO_ERROR) {
    logger.error() << "Failed to delete route to"
-                   << prefix.toString()
+                   << logger.sensitive(prefix.toString())
                   << "result:" << result;
  }
  return result == NO_ERROR;
--- a/client/platforms/windows/windowscommons.cpp
+++ b/client/platforms/windows/windowscommons.cpp
@@ -21,7 +21,7 @@
 #include "platforms/windows/windowsutils.h"

 constexpr const char* VPN_NAME = "AmneziaVPN";
-constexpr const char* WIREGUARD_DIR = "AmneziaWG";
+constexpr const char* WIREGUARD_DIR = "WireGuard";
 constexpr const char* DATA_DIR = "Data";

 namespace {
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -34,13 +34,13 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s

 void ConnectionController::openConnection()
 {
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    if (!Utils::processIsRunning(Utils::executable(SERVICE_NAME, false), true))
-    {
-        emit connectionErrorOccurred(ErrorCode::AmneziaServiceNotRunning);
-        return;
-    }
-#endif
+// #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+//     if (!Utils::processIsRunning(Utils::executable(SERVICE_NAME, false), true))
+//     {
+//         emit connectionErrorOccurred(ErrorCode::AmneziaServiceNotRunning);
+//         return;
+//     }
+// #endif

    int serverIndex = m_serversModel->getDefaultServerIndex();
    QJsonObject serverConfig = m_serversModel->getServerConfig(serverIndex);
@@ -51,9 +51,6 @@ void ConnectionController::openConnection()
    if (configVersion == ApiConfigSources::Telegram
        && !m_serversModel->data(serverIndex, ServersModel::Roles::HasInstalledContainers).toBool()) {
        emit updateApiConfigFromTelegram();
-        } else if (configVersion == ApiConfigSources::AmneziaGateway
-        && !m_serversModel->data(serverIndex, ServersModel::Roles::HasInstalledContainers).toBool()) {
-        emit updateApiConfigFromGateway();
    } else if (configVersion && m_serversModel->isApiKeyExpired(serverIndex)) {
        qDebug() << "attempt to update api config by end_date event";
        if (configVersion == ApiConfigSources::Telegram) {
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -39,12 +39,11 @@ namespace
        const QString amneziaConfigPatternUserName = "userName";
        const QString amneziaConfigPatternPassword = "password";
        const QString amneziaFreeConfigPattern = "api_key";
-        const QString amneziaPremiumConfigPattern = "auth_data";
        const QString backupPattern = "Servers/serversList";

        if (config.contains(backupPattern)) {
            return ConfigTypes::Backup;
-        } else if (config.contains(amneziaConfigPattern) || config.contains(amneziaFreeConfigPattern) || config.contains(amneziaPremiumConfigPattern)
+        } else if (config.contains(amneziaConfigPattern) || config.contains(amneziaFreeConfigPattern)
                   || (config.contains(amneziaConfigPatternHostName) && config.contains(amneziaConfigPatternUserName)
                       && config.contains(amneziaConfigPatternPassword))) {
            return ConfigTypes::Amnezia;
@@ -85,7 +84,7 @@ bool ImportController::extractConfigFromFile(const QString &fileName)
        return extractConfigFromData(data);
    }

-    emit importErrorOccurred(ErrorCode::ImportOpenConfigError, false);
+    emit importErrorOccurred(tr("Unable to open file"), false);
    return false;
 }

@@ -189,12 +188,12 @@ bool ImportController::extractConfigFromData(QString data)
        if (!m_serversModel->getServersCount()) {
            emit restoreAppConfig(config.toUtf8());
        } else {
-            emit importErrorOccurred(ErrorCode::ImportInvalidConfigError, false);
+            emit importErrorOccurred(tr("Invalid configuration file"), false);
        }
        break;
    }
    case ConfigTypes::Invalid: {
-        emit importErrorOccurred(ErrorCode::ImportInvalidConfigError, false);
+        emit importErrorOccurred(tr("Invalid configuration file"), false);
        break;
    }
    }
--- a/client/ui/controllers/importController.h
+++ b/client/ui/controllers/importController.h
@@ -54,6 +54,7 @@ public slots:

 signals:
    void importFinished();
+    void importErrorOccurred(const QString &errorMessage, bool goToPageHome);
    void importErrorOccurred(ErrorCode errorCode, bool goToPageHome);

    void qrDecodingFinished();
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -32,8 +32,32 @@ namespace
        constexpr char availableCountries[] = "available_countries";

        constexpr char apiConfig[] = "api_config";
-        constexpr char authData[] = "auth_data";
    }
+
+#ifdef Q_OS_WINDOWS
+    QString getNextDriverLetter()
+    {
+        QProcess drivesProc;
+        drivesProc.start("wmic logicaldisk get caption");
+        drivesProc.waitForFinished();
+        QString drives = drivesProc.readAll();
+        qDebug() << drives;
+
+        QString letters = "CFGHIJKLMNOPQRSTUVWXYZ";
+        QString letter;
+        for (int i = letters.size() - 1; i > 0; i--) {
+            letter = letters.at(i);
+            if (!drives.contains(letter + ":"))
+                break;
+        }
+        if (letter == "C:") {
+            // set err info
+            qDebug() << "Can't find free drive letter";
+            return "";
+        }
+        return letter;
+    }
+#endif
 }

 InstallController::InstallController(const QSharedPointer<ServersModel> &serversModel, const QSharedPointer<ContainersModel> &containersModel,
@@ -111,10 +135,10 @@ void InstallController::install(DockerContainer container, int port, TransportPr
                containerConfig[config_key::transportPacketMagicHeader] = transportPacketMagicHeader;
            } else if (container == DockerContainer::Sftp) {
                containerConfig.insert(config_key::userName, protocols::sftp::defaultUserName);
-                containerConfig.insert(config_key::password, Utils::getRandomString(16));
+                containerConfig.insert(config_key::password, Utils::getRandomString(10));
            } else if (container == DockerContainer::Socks5Proxy) {
                containerConfig.insert(config_key::userName, protocols::socks5Proxy::defaultUserName);
-                containerConfig.insert(config_key::password, Utils::getRandomString(16));
+                containerConfig.insert(config_key::password, Utils::getRandomString(10));
            }

            config.insert(config_key::container, ContainerProps::containerToString(container));
@@ -643,7 +667,7 @@ void InstallController::mountSftpDrive(const QString &port, const QString &passw
    QString hostname = serverCredentials.hostName;

 #ifdef Q_OS_WINDOWS
-    mountPath = Utils::getNextDriverLetter() + ":";
+    mountPath = getNextDriverLetter() + ":";
    //    QString cmd = QString("net use \\\\sshfs\\%1@x.x.x.x!%2 /USER:%1 %3")
    //            .arg(labelTftpUserNameText())
    //            .arg(labelTftpPortText())
@@ -744,7 +768,7 @@ bool InstallController::checkSshConnection(QSharedPointer<ServerController> serv
    } else {
        if (output.contains(tr("Please login as the user"))) {
            output.replace("\n", "");
-            emit wrongInstallationUser(output);
+            emit installationErrorOccurred(output);
            return false;
        }
    }
@@ -802,7 +826,7 @@ bool InstallController::installServiceFromApi()

    ErrorCode errorCode = apiController.getConfigForService(m_settings->getInstallationUuid(true), m_apiServicesModel->getCountryCode(),
                                                            m_apiServicesModel->getSelectedServiceType(),
-                                                            m_apiServicesModel->getSelectedServiceProtocol(), "", QJsonObject(), serverConfig);
+                                                            m_apiServicesModel->getSelectedServiceProtocol(), "", serverConfig);
    if (errorCode != ErrorCode::NoError) {
        emit installationErrorOccurred(errorCode);
        return false;
@@ -829,26 +853,24 @@ bool InstallController::updateServiceFromApi(const int serverIndex, const QStrin

    auto serverConfig = m_serversModel->getServerConfig(serverIndex);
    auto apiConfig = serverConfig.value(configKey::apiConfig).toObject();
-    auto authData = serverConfig.value(configKey::authData).toObject();

    QJsonObject newServerConfig;
-    ErrorCode errorCode = apiController.getConfigForService(
-            m_settings->getInstallationUuid(true), apiConfig.value(configKey::userCountryCode).toString(),
-            apiConfig.value(configKey::serviceType).toString(), apiConfig.value(configKey::serviceProtocol).toString(), newCountryCode,
-            authData, newServerConfig);
+    ErrorCode errorCode =
+            apiController.getConfigForService(m_settings->getInstallationUuid(true), apiConfig.value(configKey::userCountryCode).toString(),
+                                              apiConfig.value(configKey::serviceType).toString(),
+                                              apiConfig.value(configKey::serviceProtocol).toString(), newCountryCode, newServerConfig);
    if (errorCode != ErrorCode::NoError) {
        emit installationErrorOccurred(errorCode);
        return false;
    }

    QJsonObject newApiConfig = newServerConfig.value(configKey::apiConfig).toObject();
+    newApiConfig.insert(configKey::serviceInfo, apiConfig.value(configKey::serviceInfo));
    newApiConfig.insert(configKey::userCountryCode, apiConfig.value(configKey::userCountryCode));
    newApiConfig.insert(configKey::serviceType, apiConfig.value(configKey::serviceType));
    newApiConfig.insert(configKey::serviceProtocol, apiConfig.value(configKey::serviceProtocol));

    newServerConfig.insert(configKey::apiConfig, newApiConfig);
-    newServerConfig.insert(configKey::authData, authData);
-    newServerConfig.insert(config_key::crc, serverConfig.value(config_key::crc));
    m_serversModel->editServer(newServerConfig, serverIndex);

    if (reloadServiceConfig) {
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -75,8 +75,8 @@ signals:
    void removeAllContainersFinished(const QString &finishedMessage);
    void removeProcessedContainerFinished(const QString &finishedMessage);

+    void installationErrorOccurred(const QString &errorMessage);
    void installationErrorOccurred(ErrorCode errorCode);
-    void wrongInstallationUser(const QString &message);

    void serverAlreadyExists(int serverIndex);

--- a/client/ui/models/apiCountryModel.cpp
+++ b/client/ui/models/apiCountryModel.cpp
@@ -39,9 +39,6 @@ QVariant ApiCountryModel::data(const QModelIndex &index, int role) const
    case CountryNameRole: {
        return countryInfo.value(configKey::serverCountryName).toString();
    }
-    case CountryImageCodeRole: {
-        return countryInfo.value(configKey::serverCountryCode).toString().toUpper();
-    }
    }

    return QVariant();
@@ -79,6 +76,5 @@ QHash<int, QByteArray> ApiCountryModel::roleNames() const
    QHash<int, QByteArray> roles;
    roles[CountryNameRole] = "countryName";
    roles[CountryCodeRole] = "countryCode";
-    roles[CountryImageCodeRole] = "countryImageCode";
    return roles;
 }
--- a/client/ui/models/apiCountryModel.h
+++ b/client/ui/models/apiCountryModel.h
@@ -11,8 +11,7 @@ class ApiCountryModel : public QAbstractListModel
 public:
    enum Roles {
        CountryNameRole = Qt::UserRole + 1,
-        CountryCodeRole,
-        CountryImageCodeRole
+        CountryCodeRole
    };

    explicit ApiCountryModel(QObject *parent = nullptr);
--- a/client/ui/models/clientManagementModel.cpp
+++ b/client/ui/models/clientManagementModel.cpp
@@ -77,7 +77,6 @@ ErrorCode ClientManagementModel::updateModel(const DockerContainer container, co
 {
    beginResetModel();
    m_clientsTable = QJsonArray();
-    endResetModel();

    ErrorCode error = ErrorCode::NoError;

@@ -91,10 +90,10 @@ ErrorCode ClientManagementModel::updateModel(const DockerContainer container, co
    const QByteArray clientsTableString = serverController->getTextFileFromContainer(container, credentials, clientsTableFile, error);
    if (error != ErrorCode::NoError) {
        logger.error() << "Failed to get the clientsTable file from the server";
+        endResetModel();
        return error;
    }

-    beginResetModel();
    m_clientsTable = QJsonDocument::fromJson(clientsTableString).array();

    if (m_clientsTable.isEmpty()) {
@@ -602,6 +601,5 @@ QHash<int, QByteArray> ClientManagementModel::roleNames() const
    roles[LatestHandshakeRole] = "latestHandshake";
    roles[DataReceivedRole] = "dataReceived";
    roles[DataSentRole] = "dataSent";
-    roles[AllowedIpsRole] = "allowedIps";
    return roles;
 }
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -771,5 +771,5 @@ const QString ServersModel::getDefaultServerImagePathCollapsed()
    if (countryCode.isEmpty()) {
        return "";
    }
-    return QString("qrc:/countriesFlags/images/flagKit/%1.svg").arg(countryCode.toUpper());
+    return QString("qrc:/countriesFlags/images/flagKit/%1.svg").arg(countryCode);
 }
--- a/client/ui/qml/Pages2/PageSettingsApiLanguageList.qml
+++ b/client/ui/qml/Pages2/PageSettingsApiLanguageList.qml
@@ -90,7 +90,7 @@ PageType {
                        Layout.rightMargin: 32
                        Layout.alignment: Qt.AlignRight

-                        source: "qrc:/countriesFlags/images/flagKit/" + countryImageCode + ".svg"
+                        source: "qrc:/countriesFlags/images/flagKit/" + countryCode + ".svg"
                    }
                }

--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -49,8 +49,6 @@ PageType {


            HeaderType {
-                property bool isVisible: SettingsController.getInstallationUuid() !== "" || PageController.isStartPageVisible()
-
                Layout.fillWidth: true
                Layout.topMargin: 24
                Layout.rightMargin: 16
@@ -58,7 +56,7 @@ PageType {

                headerText: qsTr("Connection")

-                actionButtonImage: isVisible ? "qrc:/images/controls/more-vertical.svg" : ""
+                actionButtonImage: PageController.isStartPageVisible() ? "qrc:/images/controls/more-vertical.svg" : ""
                actionButtonFunction: function() {
                    moreActionsDrawer.open()
                }
@@ -69,19 +67,18 @@ PageType {
                    parent: root

                    anchors.fill: parent
-                    expandedHeight: root.height * 0.5
+                    expandedHeight: root.height * 0.35

                    expandedContent: ColumnLayout {
                        anchors.top: parent.top
                        anchors.left: parent.left
                        anchors.right: parent.right
-                        spacing: 0
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16

                        HeaderType {
                            Layout.fillWidth: true
                            Layout.topMargin: 32
-                            Layout.leftMargin: 16
-                            Layout.rightMargin: 16

                            headerText: qsTr("Settings")
                        }
@@ -90,12 +87,9 @@ PageType {
                            id: switcher
                            Layout.fillWidth: true
                            Layout.topMargin: 16
-                            Layout.leftMargin: 16
-                            Layout.rightMargin: 16

                            text: qsTr("Enable logs")

-                            visible: PageController.isStartPageVisible()
                            checked: SettingsController.isLoggingEnabled
                            onCheckedChanged: {
                                if (checked !== SettingsController.isLoggingEnabled) {
@@ -104,28 +98,6 @@ PageType {
                            }
                        }

-                        LabelWithButtonType {
-                            id: supportUuid
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            text: qsTr("Support tag")
-                            descriptionText: SettingsController.getInstallationUuid()
-
-                            descriptionOnTop: true
-
-                            rightImageSource: "qrc:/images/controls/copy.svg"
-                            rightImageColor: AmneziaStyle.color.paleGray
-
-                            visible: SettingsController.getInstallationUuid() !== ""
-                            clickedFunction: function() {
-                                GC.copyToClipBoard(descriptionText)
-                                PageController.showNotificationMessage(qsTr("Copied"))
-                                if (!GC.isMobile()) {
-                                    this.rightButton.forceActiveFocus()
-                                }
-                            }
-                        }
                    }
                }
            }
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -37,7 +37,7 @@ PageType {
    Connections {
        target: ImportController

-        function onImportErrorOccurred(error, goToPageHome) {
+        function onImportErrorOccurred(errorMessage, goToPageHome) {
            if (goToPageHome) {
                PageController.goToStartPage()
            } else {
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -772,8 +772,7 @@ PageType {
                                }
                            }

-                            width: root.width
-                            height: root.height
+                            anchors.fill: parent

                            expandedContent: ColumnLayout {
                                id: expandedContent
@@ -784,6 +783,8 @@ PageType {
                                anchors.leftMargin: 16
                                anchors.rightMargin: 16

+                                spacing: 8
+
                                onImplicitHeightChanged: {
                                    clientInfoDrawer.expandedHeight = expandedContent.implicitHeight + 32
                                }
@@ -796,54 +797,57 @@ PageType {
                                    }
                                }

-                                Header2TextType {
-                                    Layout.maximumWidth: parent.width
+                                Header2Type {
+                                    Layout.fillWidth: true
+
+                                    headerText: clientName
+                                }
+
+                                ColumnLayout
+                                {
+                                    id: textColumn
+                                    property string textColor: AmneziaStyle.color.mutedGray
                                    Layout.bottomMargin: 24

-                                    text: clientName
-                                    maximumLineCount: 2
-                                    wrapMode: Text.Wrap
-                                    elide: Qt.ElideRight
-                                }
+                                    ParagraphTextType {
+                                        color: textColumn.textColor
+                                        visible: creationDate
+                                        Layout.fillWidth: true

-                                ParagraphTextType {
-                                    color: AmneziaStyle.color.mutedGray
-                                    visible: creationDate
-                                    Layout.fillWidth: true
+                                        text: qsTr("Creation date: %1").arg(creationDate)
+                                    }

-                                    text: qsTr("Creation date: %1").arg(creationDate)
-                                }
+                                    ParagraphTextType {
+                                        color: textColumn.textColor
+                                        visible: latestHandshake
+                                        Layout.fillWidth: true

-                                ParagraphTextType {
-                                    color: AmneziaStyle.color.mutedGray
-                                    visible: latestHandshake
-                                    Layout.fillWidth: true
+                                        text: qsTr("Latest handshake: %1").arg(latestHandshake)
+                                    }

-                                    text: qsTr("Latest handshake: %1").arg(latestHandshake)
-                                }
+                                    ParagraphTextType {
+                                        color: textColumn.textColor
+                                        visible: dataReceived
+                                        Layout.fillWidth: true

-                                ParagraphTextType {
-                                    color: AmneziaStyle.color.mutedGray
-                                    visible: dataReceived
-                                    Layout.fillWidth: true
+                                        text: qsTr("Data received: %1").arg(dataReceived)
+                                    }

-                                    text: qsTr("Data received: %1").arg(dataReceived)
-                                }
+                                    ParagraphTextType {
+                                        color: textColumn.textColor
+                                        visible: dataSent
+                                        Layout.fillWidth: true

-                                ParagraphTextType {
-                                    color: AmneziaStyle.color.mutedGray
-                                    visible: dataSent
-                                    Layout.fillWidth: true
+                                        text: qsTr("Data sent: %1").arg(dataSent)
+                                    }

-                                    text: qsTr("Data sent: %1").arg(dataSent)
-                                }
+                                    ParagraphTextType {
+                                        color: textColumn.textColor
+                                        visible: allowedIps
+                                        Layout.fillWidth: true

-                                ParagraphTextType {
-                                    color: AmneziaStyle.color.mutedGray
-                                    visible: allowedIps
-                                    Layout.fillWidth: true
-
-                                    text: qsTr("Allowed IPs: %1").arg(allowedIps)
+                                        text: qsTr("Allowed IPs: %1").arg(allowedIps)
+                                    }
                                }

                                Item {
@@ -948,7 +952,6 @@ PageType {
                                BasicButtonType {
                                    id: revokeButton
                                    Layout.fillWidth: true
-                                    Layout.topMargin: 8

                                    defaultColor: AmneziaStyle.color.transparent
                                    hoveredColor: AmneziaStyle.color.translucentWhite
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -123,10 +123,6 @@ PageType {
            }
        }

-        function onWrongInstallationUser(message) {
-            onInstallationErrorOccurred(message)
-        }
-
        function onUpdateContainerFinished(message) {
            PageController.showNotificationMessage(message)
            PageController.closePage()
--- a/client/utilities.cpp
+++ b/client/utilities.cpp
@@ -10,72 +10,18 @@
 #include <QJsonObject>

 #include "utilities.h"
-
-#ifdef Q_OS_WINDOWS
-QString printErrorMessage(DWORD errorCode) {
-    LPVOID lpMsgBuf;
-
-    DWORD dwFlags = FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                    FORMAT_MESSAGE_FROM_SYSTEM |
-                    FORMAT_MESSAGE_IGNORE_INSERTS;
-
-    DWORD dwLanguageId = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US);
-
-    FormatMessageW(
-        dwFlags,
-        NULL,
-        errorCode,
-        dwLanguageId,
-        (LPWSTR)&lpMsgBuf,
-        0,
-        NULL
-        );
-
-    QString errorMsg = QString::fromWCharArray((LPCWSTR)lpMsgBuf);
-    LocalFree(lpMsgBuf);
-    return errorMsg.trimmed();
-}
-
-QString Utils::getNextDriverLetter()
-{
-    DWORD drivesBitmask = GetLogicalDrives();
-    if (drivesBitmask == 0) {
-        DWORD error = GetLastError();
-        qDebug() << "GetLogicalDrives failed. Error code:" << error;
-        return "";
-    }
-
-    QString letters = "FGHIJKLMNOPQRSTUVWXYZ";
-    QString availableLetter;
-
-    for (int i = letters.size() - 1; i >= 0; --i) {
-        QChar letterChar = letters.at(i);
-        int driveIndex = letterChar.toLatin1() - 'A';
-
-        if ((drivesBitmask & (1 << driveIndex)) == 0) {
-            availableLetter = letterChar;
-            break;
-        }
-    }
-
-    if (availableLetter.isEmpty()) {
-        qDebug() << "Can't find free drive letter";
-        return "";
-    }
-
-    return availableLetter;
-}
-#endif
+#include "version.h"

 QString Utils::getRandomString(int len)
 {
-    const QString possibleCharacters = QStringLiteral("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
+    const QString possibleCharacters("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
+
    QString randomString;
-
    for (int i = 0; i < len; ++i) {
-        randomString.append(possibleCharacters.at(QRandomGenerator::system()->bounded(possibleCharacters.length())));
+        quint32 index = QRandomGenerator::global()->generate() % possibleCharacters.length();
+        QChar nextChar = possibleCharacters.at(index);
+        randomString.append(nextChar);
    }
-
    return randomString;
 }

@@ -163,34 +109,30 @@ QString Utils::usrExecutable(const QString &baseName)
 bool Utils::processIsRunning(const QString &fileName, const bool fullFlag)
 {
 #ifdef Q_OS_WIN
-    HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-    if (hSnapshot == INVALID_HANDLE_VALUE) {
-        qWarning() << "Utils::processIsRunning error CreateToolhelp32Snapshot";
-        return false;
-    }
+    QProcess process;
+    process.setReadChannel(QProcess::StandardOutput);
+    process.setProcessChannelMode(QProcess::MergedChannels);
+    process.start("wmic.exe",
+                  QStringList() << "/OUTPUT:STDOUT"
+                                << "PROCESS"
+                                << "get"
+                                << "Caption");
+    process.waitForStarted();
+    process.waitForFinished();
+    QString processData(process.readAll());
+    QStringList processList = processData.split(QRegularExpression("[\r\n]"), Qt::SkipEmptyParts);
+    foreach (const QString &rawLine, processList) {
+        const QString line = rawLine.simplified();
+        if (line.isEmpty()) {
+            continue;
+        }

-    PROCESSENTRY32W pe32;
-    pe32.dwSize = sizeof(PROCESSENTRY32W);
-
-    if (!Process32FirstW(hSnapshot, &pe32)) {
-        CloseHandle(hSnapshot);
-        qWarning() << "Utils::processIsRunning error Process32FirstW";
-        return false;
-    }
-
-    do {
-        QString exeFile = QString::fromWCharArray(pe32.szExeFile);
-
-        if (exeFile.compare(fileName, Qt::CaseInsensitive) == 0) {
-            CloseHandle(hSnapshot);
+        if (line == fileName) {
            return true;
        }
-    } while (Process32NextW(hSnapshot, &pe32));
-
-    CloseHandle(hSnapshot);
+    }
    return false;
-
-#elif defined(Q_OS_IOS) || defined(Q_OS_ANDROID)
+#elif defined(Q_OS_IOS)
    return false;
 #else
    QProcess process;
@@ -208,45 +150,13 @@ bool Utils::processIsRunning(const QString &fileName, const bool fullFlag)
 #endif
 }

-bool Utils::killProcessByName(const QString &name)
+void Utils::killProcessByName(const QString &name)
 {
    qDebug().noquote() << "Kill process" << name;
 #ifdef Q_OS_WIN
-    HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-    if (hSnapshot == INVALID_HANDLE_VALUE)
-        return false;
-
-    PROCESSENTRY32W pe32;
-    pe32.dwSize = sizeof(PROCESSENTRY32W);
-
-    bool success = false;
-
-    if (Process32FirstW(hSnapshot, &pe32)) {
-        do {
-            QString exeFile = QString::fromWCharArray(pe32.szExeFile);
-
-            if (exeFile.compare(name, Qt::CaseInsensitive) == 0) {
-                HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pe32.th32ProcessID);
-                if (hProcess != NULL) {
-                    if (TerminateProcess(hProcess, 0)) {
-                        success = true;
-                    } else {
-                        DWORD error = GetLastError();
-                        qCritical() << "Can't terminate process" << exeFile << "(PID:" << pe32.th32ProcessID << "). Error:" << printErrorMessage(error);
-                    }
-                    CloseHandle(hProcess);
-                } else {
-                    DWORD error = GetLastError();
-                    qCritical() << "Can't open process for termination" << exeFile << "(PID:" << pe32.th32ProcessID << "). Error:" << printErrorMessage(error);
-                }
-            }
-        } while (Process32NextW(hSnapshot, &pe32));
-    }
-
-    CloseHandle(hSnapshot);
-    return success;
-#elif defined Q_OS_IOS || defined(Q_OS_ANDROID)
-    return false;
+    QProcess::execute("taskkill", QStringList() << "/IM" << name << "/F");
+#elif defined Q_OS_IOS
+    return;
 #else
    QProcess::execute(QString("pkill %1").arg(name));
 #endif
@@ -334,22 +244,3 @@ bool Utils::signalCtrl(DWORD dwProcessId, DWORD dwCtrlEvent)
 }

 #endif
-
-void Utils::logException(const std::exception &e)
-{
-    qCritical() << e.what();
-    try {
-        std::rethrow_if_nested(e);
-    } catch (const std::exception &nested) {
-        logException(nested);
-    } catch (...) {}
-}
-
-void Utils::logException(const std::exception_ptr &eptr)
-{
-    try {
-        if (eptr) std::rethrow_exception(eptr);
-    } catch (const std::exception &e) {
-        logException(e);
-    } catch (...) {}
-}
--- a/client/utilities.h
+++ b/client/utilities.h
@@ -7,8 +7,7 @@
 #include <QJsonDocument>

 #ifdef Q_OS_WIN
-#include <windows.h>
-#include <tlhelp32.h>
+    #include "Windows.h"
 #endif

 class Utils : public QObject
@@ -28,19 +27,15 @@ public:
    static bool initializePath(const QString &path);

    static bool processIsRunning(const QString &fileName, const bool fullFlag = false);
-    static bool killProcessByName(const QString &name);
+    static void killProcessByName(const QString &name);

    static QString openVpnExecPath();
    static QString wireguardExecPath();
    static QString certUtilPath();
    static QString tun2socksPath();

-    static void logException(const std::exception &e);
-    static void logException(const std::exception_ptr &eptr = std::current_exception());
-
 #ifdef Q_OS_WIN
    static bool signalCtrl(DWORD dwProcessId, DWORD dwCtrlEvent);
-    static QString getNextDriverLetter();
 #endif
 };

--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -56,15 +56,14 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
 {

 #ifdef AMNEZIA_DESKTOP
-    auto container = m_settings->defaultContainer(m_settings->defaultServerIndex());
+    QString proto = m_settings->defaultContainerName(m_settings->defaultServerIndex());

    if (IpcClient::Interface()) {
        if (state == Vpn::ConnectionState::Connected) {
            IpcClient::Interface()->resetIpStack();
            IpcClient::Interface()->flushDns();

-            if (!m_vpnConfiguration.value(config_key::configVersion).toInt() && container != DockerContainer::Awg
-                && container != DockerContainer::WireGuard) {
+            if (!m_vpnConfiguration.value(config_key::configVersion).toInt()) {
                QString dns1 = m_vpnConfiguration.value(config_key::dns1).toString();
                QString dns2 = m_vpnConfiguration.value(config_key::dns2).toString();

--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -23,7 +23,6 @@ Options:
                                  By default, the latest available platform is used
 -m, --move                       Move the build result to the root of the build directory
 -f, --fdroid                     Build for F-Droid
- -p, --play                       Build AAB for Google Play
 -h, --help                       Display this help

 EOT
@@ -31,7 +30,7 @@ EOT

 BUILD_TYPE="release"

-opts=$(getopt -l debug,aab,apk:,build-platform:,move,fdroid,play,help -o "dua:b:mfph" -- "$@")
+opts=$(getopt -l debug,aab,apk:,build-platform:,move,fdroid,help -o "dua:b:mfh" -- "$@")
 eval set -- "$opts"
 while true; do
  case "$1" in
@@ -41,7 +40,6 @@ while true; do
    -b | --build-platform) ANDROID_BUILD_PLATFORM=$2; shift 2;;
    -m | --move) MOVE_RESULT=1; shift;;
    -f | --fdroid) FDROID=1; shift;;
-    -p | --play) PLAY=1; shift;;
    -h | --help) usage; exit 0;;
    --) shift; break;;
  esac
@@ -151,17 +149,11 @@ if [ -v FDROID ]; then
  BUILD_TYPE="fdroid"
 fi

-if [ -v PLAY ]; then
-  AAB_FLAVOR="play"
-else
-  AAB_FLAVOR="oss"
-fi
-
 if [ -v AAB ]; then
-  gradle_opts+=(bundle"${AAB_FLAVOR^}${BUILD_TYPE^}")
+  gradle_opts+=(bundle"${BUILD_TYPE^}")
 fi
 if [ -v ABIS ]; then
-  gradle_opts+=(assembleOss"${BUILD_TYPE^}")
+  gradle_opts+=(assemble"${BUILD_TYPE^}")
 fi

 $OUT_APP_DIR/android-build/gradlew \
@@ -172,7 +164,7 @@ $OUT_APP_DIR/android-build/gradlew \
 if [[ -v CI || -v MOVE_RESULT ]]; then
  echo "Moving APK/AAB..."
  if [ -v AAB ]; then
-    mv -u $OUT_APP_DIR/android-build/build/outputs/bundle/$AAB_FLAVOR"${BUILD_TYPE^}"/AmneziaVPN-$AAB_FLAVOR-$BUILD_TYPE.aab \
+    mv -u $OUT_APP_DIR/android-build/build/outputs/bundle/$BUILD_TYPE/AmneziaVPN-$BUILD_TYPE.aab \
       $PROJECT_DIR/deploy/build/
  fi

@@ -189,7 +181,7 @@ if [[ -v CI || -v MOVE_RESULT ]]; then
    IFS=';' read -r -a abi_array <<< "$ABIS"
    for ABI in "${abi_array[@]}"
    do
-      mv -u $OUT_APP_DIR/android-build/build/outputs/apk/oss/$BUILD_TYPE/AmneziaVPN-oss-$ABI-$suffix.apk \
+      mv -u $OUT_APP_DIR/android-build/build/outputs/apk/$BUILD_TYPE/AmneziaVPN-$ABI-$suffix.apk \
       $PROJECT_DIR/deploy/build/
    done
  fi
--- a/metadata/img-readme/andr.png
+++ b/metadata/img-readme/andr.png
--- a/metadata/img-readme/download.png
+++ b/metadata/img-readme/download.png
--- a/metadata/img-readme/lin.png
+++ b/metadata/img-readme/lin.png
--- a/metadata/img-readme/mac.png
+++ b/metadata/img-readme/mac.png
--- a/metadata/img-readme/testiny.png
+++ b/metadata/img-readme/testiny.png
--- a/metadata/img-readme/win.png
+++ b/metadata/img-readme/win.png