Revert "chore: update licnese file (#2376)"

This reverts commit ec3ab2a03c.

README.md

@@ -179,7 +179,7 @@ You may face compiling issues in QT Creator after you've worked in Android Studi
 
 ## License
 
-This project is licensed under the GNU General Public License v3.0 (see LICENSE) and also includes third-party components distributed under their own terms (see THIRD_PARTY_LICENSES.md).
+GPL v3.0
 
 ## Donate
 

THIRD_PARTY_LICENSES.md

@@ -1,149 +0,0 @@
-# Third-Party Licenses
-
-This project is licensed under the GNU General Public License v3.0.
-This file lists third-party software components used by this repository.
-Each component is distributed under its own license as linked below.
-
----
-
-## QtKeychain
-
-- Source: https://github.com/frankosterfeld/qtkeychain
-- License: BSD License
-- License Text: https://www.gnu.org/licenses/license-list.html#ModifiedBSD
-
----
-
-## QSimpleCrypto
-
-- Source: https://github.com/n1flh31mur/QSimpleCrypto
-- License: Apache License 2.0
-- License Text: https://github.com/n1flh31mur/QSimpleCrypto/blob/master/LICENSE
-
----
-
-## SortFilterProxyModel
-
-- Source: https://github.com/oKcerG/SortFilterProxyModel
-- License: MIT License
-- License Text: https://github.com/oKcerG/SortFilterProxyModel/blob/master/LICENSE
-
----
-
-## QJsonStruct
-
-- Source: https://github.com/Qv2ray/QJsonStruct
-- License: MIT License
-- License Text: https://github.com/Qv2ray/QJsonStruct/blob/master/LICENSE
-
----
-
-## QR Code Generator (qrcodegen)
-
-- Source: https://github.com/nayuki/QR-Code-generator
-- License: MIT License
-- License Text: https://www.nayuki.io/page/qr-code-generator-library
-
----
-
-## Qt Gamepad
-
-- Source: https://github.com/qt/qtgamepad
-- License: GNU General Public License v3.0 (GPL-3.0)
-- License Text: https://www.gnu.org/licenses/gpl-3.0.en.html
-
----
-
-## AmneziaWG Apple (WireGuard)
-
-- Source: https://github.com/amnezia-vpn/amneziawg-apple
-- License: MIT License
-- License Text: https://github.com/amnezia-vpn/amneziawg-apple/blob/master/COPYING
-
----
-
-## AmneziaWG Android
-
-- Source: https://github.com/amnezia-vpn/amneziawg-go
-- License: MIT License
-- License Text: https://github.com/amnezia-vpn/amneziawg-go/blob/master/LICENSE
-
----
-
-## Xray Core
-
-- Source: https://github.com/XTLS/Xray-core
-- License: Mozilla Public License 2.0 (MPL-2.0)
-- License Text: https://github.com/XTLS/Xray-core/blob/main/LICENSE
-
----
-
-## Cloak
-
-- Source: https://github.com/cbeuw/Cloak
-- License: GNU General Public License v3.0 (GPL-3.0)
-- License Text: https://github.com/cbeuw/Cloak/blob/master/LICENSE
-
----
-
-## Shadowsocks
-
-- Source: https://github.com/shadowsocks/shadowsocks-libev
-- License: GPL-3.0-or-later
-- License Text: http://www.gnu.org/licenses/
-
----
-
-## OpenSSL
-
-- Source: https://github.com/openssl/openssl
-- License: Apache License 2.0
-- License Text: https://www.openssl.org/source/license.html
-
----
-
-## libssh
-
-- Source: https://www.libssh.org/
-- License: GNU Lesser General Public License (LGPL)
-- License Text: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-
----
-
-## OpenVPNAdapter
-
-- Source: https://github.com/ss-abramchuk/OpenVPNAdapter
-- License: GNU Affero General Public License v3.0 (AGPL-3.0)
-- License Text: https://github.com/ss-abramchuk/OpenVPNAdapter/blob/master/LICENSE
-
----
-
-## Wintun
-
-- Source: https://www.wintun.net/
-- License: Prebuilt Binaries License
-- License Text: https://github.com/WireGuard/wintun/blob/master/prebuilt-binaries-license.txt
-
----
-
-## Mullvad Split Tunnel Driver
-
-- Source: https://github.com/mullvad/win-split-tunnel
-- License: GNU General Public License v3.0 (GPL-3.0) and Mozilla Public License Version 2.0
-- License Text: https://github.com/mullvad/win-split-tunnel/blob/master/LICENSE-GPL.md https://github.com/mullvad/win-split-tunnel/blob/master/LICENSE-MPL.txt
-
----
-
-## tun2socks
-
-- Source: https://github.com/eycorsican/go-tun2socks
-- License: MIT License
-- License Text: https://github.com/eycorsican/go-tun2socks/blob/master/LICENSE
-
----
-
-## TAP-Windows Driver
-
-- Source: https://github.com/OpenVPN/tap-windows6
-- License: tap-windows6 license
-- License Text: https://github.com/OpenVPN/tap-windows6/blob/master/COPYING

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

@@ -816,7 +816,7 @@ class AmneziaActivity : QtActivity() {
     @Suppress("unused")
     fun getFd(fileName: String): Int {
         Log.v(TAG, "Get fd for $fileName")
-        return blockingCall(Dispatchers.IO) {
+        return blockingCall {
             try {
                 pfd = contentResolver.openFileDescriptor(Uri.parse(fileName), "r")
                 pfd?.fd ?: -1

client/core/api/apiDefs.h

@@ -10,10 +10,8 @@ namespace apiDefs
         AmneziaFreeV3,
         AmneziaPremiumV1,
         AmneziaPremiumV2,
-        AmneziaTrialV2,
         SelfHosted,
-        ExternalPremium,
-        ExternalTrial
+        ExternalPremium
     };
 
     enum ConfigSource {

client/core/api/apiUtils.cpp

@@ -58,24 +58,18 @@ apiDefs::ConfigType apiUtils::getConfigType(const QJsonObject &serverConfigObjec
     };
     case apiDefs::ConfigSource::AmneziaGateway: {
         constexpr QLatin1String servicePremium("amnezia-premium");
-        constexpr QLatin1String serviceTrial("amnezia-trial");
         constexpr QLatin1String serviceFree("amnezia-free");
         constexpr QLatin1String serviceExternalPremium("external-premium");
-        constexpr QLatin1String serviceExternalTrial("external-trial");
 
         auto apiConfigObject = serverConfigObject.value(apiDefs::key::apiConfig).toObject();
         auto serviceType = apiConfigObject.value(apiDefs::key::serviceType).toString();
 
         if (serviceType == servicePremium) {
             return apiDefs::ConfigType::AmneziaPremiumV2;
-        } else if (serviceType == serviceTrial) {
-            return apiDefs::ConfigType::AmneziaTrialV2;
         } else if (serviceType == serviceFree) {
             return apiDefs::ConfigType::AmneziaFreeV3;
         } else if (serviceType == serviceExternalPremium) {
             return apiDefs::ConfigType::ExternalPremium;
-        } else if (serviceType == serviceExternalTrial) {
-            return apiDefs::ConfigType::ExternalTrial;
         }
     }
     default: {
@@ -139,8 +133,7 @@ amnezia::ErrorCode apiUtils::checkNetworkReplyErrors(const QList<QSslError> &ssl
 bool apiUtils::isPremiumServer(const QJsonObject &serverConfigObject)
 {
     static const QSet<apiDefs::ConfigType> premiumTypes = { apiDefs::ConfigType::AmneziaPremiumV1, apiDefs::ConfigType::AmneziaPremiumV2,
-                                                            apiDefs::ConfigType::AmneziaTrialV2, apiDefs::ConfigType::ExternalPremium,
-                                                            apiDefs::ConfigType::ExternalTrial };
+                                                            apiDefs::ConfigType::ExternalPremium };
     return premiumTypes.contains(getConfigType(serverConfigObject));
 }
 
@@ -184,9 +177,7 @@ QString apiUtils::getPremiumV1VpnKey(const QJsonObject &serverConfigObject)
 
 QString apiUtils::getPremiumV2VpnKey(const QJsonObject &serverConfigObject)
 {
-    auto configType = apiUtils::getConfigType(serverConfigObject);
-    if (configType != apiDefs::ConfigType::AmneziaPremiumV2 && configType != apiDefs::ConfigType::AmneziaTrialV2
-        && configType != apiDefs::ConfigType::ExternalPremium && configType != apiDefs::ConfigType::ExternalTrial) {
+    if (apiUtils::getConfigType(serverConfigObject) != apiDefs::ConfigType::AmneziaPremiumV2) {
         return {};
     }
 

client/platforms/ios/PacketTunnelProvider+Xray.swift

@@ -21,44 +21,6 @@ extension Constants {
 }
 
 extension PacketTunnelProvider {
-    private func applyXraySplitTunnel(_ xrayConfig: XrayConfig,
-                                      settings: NEPacketTunnelNetworkSettings) {
-        guard let splitTunnelType = xrayConfig.splitTunnelType else {
-            return
-        }
-
-        guard let splitTunnelSites = xrayConfig.splitTunnelSites else {
-            xrayLog(.error, message: "Split tunnel sites are not set")
-            return
-        }
-
-        if splitTunnelType == 1 {
-            var ipv4IncludedRoutes = [NEIPv4Route]()
-
-            for allowedIPString in splitTunnelSites {
-                if let allowedIP = IPAddressRange(from: allowedIPString) {
-                    ipv4IncludedRoutes.append(NEIPv4Route(
-                        destinationAddress: "\(allowedIP.address)",
-                        subnetMask: "\(allowedIP.subnetMask())"))
-                }
-            }
-
-            settings.ipv4Settings?.includedRoutes = ipv4IncludedRoutes
-        } else if splitTunnelType == 2 {
-            var ipv4ExcludedRoutes = [NEIPv4Route]()
-
-            for excludedIPString in splitTunnelSites {
-                if let excludedIP = IPAddressRange(from: excludedIPString) {
-                    ipv4ExcludedRoutes.append(NEIPv4Route(
-                        destinationAddress: "\(excludedIP.address)",
-                        subnetMask: "\(excludedIP.subnetMask())"))
-                }
-            }
-
-            settings.ipv4Settings?.excludedRoutes = ipv4ExcludedRoutes
-        }
-    }
-
     func startXray(completionHandler: @escaping (Error?) -> Void) {
 
         // Xray configuration
@@ -110,7 +72,6 @@ extension PacketTunnelProvider {
             settings.dnsSettings = !dnsArray.isEmpty
             ? NEDNSSettings(servers: dnsArray)
             : NEDNSSettings(servers: ["1.1.1.1"])
-            applyXraySplitTunnel(xrayConfig, settings: settings)
 
             let xrayConfigData = xrayConfig.config.data(using: .utf8)
 

client/platforms/ios/QtAppDelegate.mm

@@ -1,91 +1,14 @@
 #import "QtAppDelegate.h"
 #import "ios_controller.h"
-#import <StoreKit/StoreKit.h>
 
 #include <QFile>
 
-namespace {
-constexpr NSInteger kReviewRequestOpenInterval = 20;
-NSString *const kAppOpenCountKey = @"AmneziaVPN.AppOpenCount";
-BOOL gShouldRequestReviewOnBecomeActive = NO;
-id gSceneWillEnterForegroundObserver = nil;
-id gSceneDidActivateObserver = nil;
-
-void scheduleAppStoreReviewIfNeededOnOpen()
-{
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    const NSInteger openCount = [defaults integerForKey:kAppOpenCountKey] + 1;
-    [defaults setInteger:openCount forKey:kAppOpenCountKey];
-
-    gShouldRequestReviewOnBecomeActive =
-        (openCount > 0 && openCount % kReviewRequestOpenInterval == 0);
-
-    NSLog(@"[Review] scene open count=%ld interval=%ld scheduled=%@",
-          (long)openCount,
-          (long)kReviewRequestOpenInterval,
-          gShouldRequestReviewOnBecomeActive ? @"YES" : @"NO");
-}
-
-void requestAppStoreReviewForScene(UIScene *scene)
-{
-    if (@available(iOS 14.0, *)) {
-        if ([scene isKindOfClass:[UIWindowScene class]] &&
-            scene.activationState == UISceneActivationStateForegroundActive) {
-            [SKStoreReviewController requestReviewInScene:(UIWindowScene *)scene];
-            NSLog(@"[Review] requestReviewInScene invoked");
-            return;
-        }
-    }
-
-    if (@available(iOS 10.3, *)) {
-        [SKStoreReviewController requestReview];
-        NSLog(@"[Review] requestReview fallback invoked");
-    }
-}
-
-void setupSceneReviewObservers()
-{
-    if (gSceneWillEnterForegroundObserver || gSceneDidActivateObserver) {
-        return;
-    }
-
-    NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-
-    if (@available(iOS 13.0, *)) {
-        gSceneWillEnterForegroundObserver =
-            [center addObserverForName:UISceneWillEnterForegroundNotification
-                                object:nil
-                                 queue:[NSOperationQueue mainQueue]
-                            usingBlock:^(__unused NSNotification *note) {
-            scheduleAppStoreReviewIfNeededOnOpen();
-        }];
-
-        gSceneDidActivateObserver =
-            [center addObserverForName:UISceneDidActivateNotification
-                                object:nil
-                                 queue:[NSOperationQueue mainQueue]
-                            usingBlock:^(NSNotification *note) {
-            if (!gShouldRequestReviewOnBecomeActive) {
-                return;
-            }
-
-            gShouldRequestReviewOnBecomeActive = NO;
-            UIScene *scene = [note.object isKindOfClass:[UIScene class]] ? (UIScene *)note.object : nil;
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                requestAppStoreReviewForScene(scene);
-            });
-        }];
-    }
-}
-} // namespace
-
 
 @implementation QIOSApplicationDelegate (AmneziaVPNDelegate)
 #if !MACOS_NE
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     [application setMinimumBackgroundFetchInterval: UIApplicationBackgroundFetchIntervalMinimum];
-    setupSceneReviewObservers();
     // Override point for customization after application launch.
     NSLog(@"Application didFinishLaunchingWithOptions");
     return YES;

client/platforms/ios/XrayConfig.swift

@@ -3,7 +3,5 @@ import Foundation
 struct XrayConfig: Decodable {
     let dns1: String?
     let dns2: String?
-    let splitTunnelType: Int?
-    let splitTunnelSites: [String]?
     let config: String
 }

client/platforms/ios/ios_controller.mm

@@ -684,15 +684,6 @@ bool IosController::setupXray()
     QJsonObject finalConfig;
     finalConfig.insert(config_key::dns1, m_rawConfig[config_key::dns1].toString());
     finalConfig.insert(config_key::dns2, m_rawConfig[config_key::dns2].toString());
-    finalConfig.insert(config_key::splitTunnelType, m_rawConfig[config_key::splitTunnelType]);
-
-    QJsonArray splitTunnelSites = m_rawConfig[config_key::splitTunnelSites].toArray();
-
-    for(int index = 0; index < splitTunnelSites.count(); index++) {
-        splitTunnelSites[index] = splitTunnelSites[index].toString().remove(" ");
-    }
-
-    finalConfig.insert(config_key::splitTunnelSites, splitTunnelSites);
     finalConfig.insert(config_key::config, xrayConfigStr);
 
     QJsonDocument finalConfigDoc(finalConfig);

client/ui/controllers/api/apiConfigsController.cpp

@@ -447,7 +447,7 @@ bool ApiConfigsController::importService()
             importSerivceFromAppStore();
             return true;
         }
-    } else if (m_apiServicesModel->getSelectedServiceType() == serviceType::amneziaFree) {
+    } else {
         importServiceFromGateway();
         return true;
     }

client/ui/models/api/apiAccountInfoModel.cpp

@@ -52,9 +52,7 @@ QVariant ApiAccountInfoModel::data(const QModelIndex &index, int role) const
     }
     case IsComponentVisibleRole: {
         return m_accountInfoData.configType == apiDefs::ConfigType::AmneziaPremiumV2
-                || m_accountInfoData.configType == apiDefs::ConfigType::AmneziaTrialV2
-                || m_accountInfoData.configType == apiDefs::ConfigType::ExternalPremium
-                || m_accountInfoData.configType == apiDefs::ConfigType::ExternalTrial;
+                || m_accountInfoData.configType == apiDefs::ConfigType::ExternalPremium;
     }
     case HasExpiredWorkerRole: {
         for (int i = 0; i < m_issuedConfigsInfo.size(); i++) {

client/ui/models/api/apiServicesModel.cpp

@@ -41,7 +41,6 @@ namespace
     {
         constexpr char amneziaFree[] = "amnezia-free";
         constexpr char amneziaPremium[] = "amnezia-premium";
-        constexpr char amneziaTrial[] = "amnezia-trial";
     }
 }
 
@@ -70,7 +69,7 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
     }
     case CardDescriptionRole: {
         auto speed = apiServiceData.serviceInfo.speed;
-        if (serviceType == serviceType::amneziaPremium || serviceType == serviceType::amneziaTrial) {
+        if (serviceType == serviceType::amneziaPremium) {
             return apiServiceData.serviceInfo.cardDescription.arg(speed);
         } else if (serviceType == serviceType::amneziaFree) {
             QString description = apiServiceData.serviceInfo.cardDescription;
@@ -125,10 +124,8 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
     case OrderRole: {
         if (serviceType == serviceType::amneziaPremium) {
             return 0;
-        } else if (serviceType == serviceType::amneziaTrial) {
-            return 1;
         } else if (serviceType == serviceType::amneziaFree) {
-            return 2;
+            return 1;
         }
     }
     }

client/ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml

@@ -122,7 +122,7 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
-                text: ApiServicesModel.getSelectedServiceType() === "amnezia-premium" ? qsTr("Subscribe Now") : (ApiServicesModel.getSelectedServiceType() === "amnezia-trial" ? qsTr("Try Trial") : qsTr("Connect"))
+                text: ApiServicesModel.getSelectedServiceType() === "amnezia-premium" ? qsTr("Subscribe Now") : qsTr("Connect")
 
                 clickedFunc: function() {
                     PageController.showBusyIndicator(true)

client/ui/qml/Pages2/PageSetupWizardCredentials.qml

@@ -79,23 +79,11 @@ PageType {
                 }
 
                 textField.onTextChanged: {
-                    if (headerText === qsTr("Password or SSH private key")) {
+                    if (headerText == qsTr("Password or SSH private key")) {
                         buttonImageSource = textField.text !== "" ? imageSource : ""
                     }
                 }
             }
-
-            WarningType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                Layout.topMargin: 8
-
-                visible: title === qsTr("Password or SSH private key")
-                backGroundColor: AmneziaStyle.color.translucentWhite
-                iconPath: "qrc:/images/controls/alert-circle.svg"
-                textString: qsTr("SSH key requirements: supported ED25519 or RSA in PEM. Paste the private key including BEGIN/END lines. If your key doesn’t work, generate a compatible one.")
-            }
         }
 
         footer: ColumnLayout {