Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/download-native-wireguard-config-on-connect

client/CMakeLists.txt

@@ -301,13 +301,14 @@ if(IOS)
 
     find_library(FW_AUTHENTICATIONSERVICES AuthenticationServices)
     find_library(FW_UIKIT UIKit)
+    find_library(FW_AVFOUNDATION AVFoundation)
     find_library(FW_FOUNDATION Foundation)
     find_library(FW_STOREKIT StoreKit)
     find_library(FW_USERNOTIFICATIONS UserNotifications)
 
     set(LIBS ${LIBS} 
         ${FW_AUTHENTICATIONSERVICES} ${FW_UIKIT} 
-        ${FW_FOUNDATION} ${FW_STOREKIT} 
+        ${FW_AVFOUNDATION} ${FW_FOUNDATION} ${FW_STOREKIT}
         ${FW_USERNOTIFICATIONS}
     )
 
@@ -461,14 +462,13 @@ if(IOS)
         PROPERTIES MACOSX_PACKAGE_LOCATION "Resources"
     )
 
-target_sources(${PROJECT} PRIVATE
+    target_sources(${PROJECT} PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/ios/Media.xcassets
-
+    )
-)
+    set_source_files_properties(
-set_source_files_properties(
         ${CMAKE_CURRENT_LIST_DIR}/ios/Media.xcassets
         PROPERTIES MACOSX_PACKAGE_LOCATION "Resources"
-)
+    )
 
     add_subdirectory(ios/networkextension)
     add_dependencies(${PROJECT} networkextension)
@@ -496,19 +496,13 @@ set_source_files_properties(
         )
 
     set_target_properties (${PROJECT} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual)
-
     set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.amnezia.AmneziaVPN")
-
     set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.amnezia.AmneziaVPN")
 
-
+    set_target_properties("networkextension" PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual)
-    set_target_properties ("networkextension" PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual)
-
     set_target_properties("networkextension" PROPERTIES XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.amnezia.AmneziaVPN.network-extension")
-
     set_target_properties("networkextension" PROPERTIES XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.amnezia.AmneziaVPN.network-extension")
 
-
 endif()
 
 if(ANDROID)

client/android/build.gradle

@@ -135,7 +135,7 @@ android {
     defaultConfig {
         resConfig "en"
         minSdkVersion = 24
-        targetSdkVersion = 30
+        targetSdkVersion = 31
         versionCode 10 // Change to a higher number
         versionName "2.0.10" // Change to a higher number
 

client/android/shadowsocks/build.gradle

@@ -53,7 +53,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
     implementation "androidx.room:room-runtime:2.2.5" // runtime
     implementation "androidx.preference:preference:1.1.0"
-    implementation "androidx.work:work-runtime-ktx:2.3.4"
+    implementation "androidx.work:work-runtime-ktx:2.7.1"
     implementation "androidx.browser:browser:1.3.0-alpha01"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "com.google.android.material:material:1.2.0-alpha05"

client/android/shadowsocks/src/main/AndroidManifest.xml

@@ -68,7 +68,8 @@
             android:name="org.amnezia.vpn.shadowsocks.core.BootReceiver"
             android:directBootAware="true"
             android:enabled="false"
-            android:process=":QtOnlyProcess">
+            android:process=":QtOnlyProcess"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />

client/android/shadowsocks/src/main/java/org/amnezia/vpn/shadowsocks/core/Core.kt

@@ -84,8 +84,9 @@ object Core {
     fun init(app: Application, configureClass: KClass<out Any>) {
         Core.app = app
         configureIntent = {
-            PendingIntent.getActivity(it, 0, Intent(it, configureClass.java)
+            PendingIntent.getActivity(it, 0,
-                    .setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), 0)
+                Intent(it, configureClass.java).setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT),
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
         }
 
         if (Build.VERSION.SDK_INT >= 24) {  // migrate old files
@@ -99,7 +100,6 @@ object Core {
 
         // overhead of debug mode is minimal: https://github.com/Kotlin/kotlinx.coroutines/blob/f528898/docs/debugging.md#debug-mode
         System.setProperty(DEBUG_PROPERTY_NAME, DEBUG_PROPERTY_VALUE_ON)
-        WorkManager.initialize(deviceStorage, Configuration.Builder().build())
 
         // handle data restored/crash
         if (Build.VERSION.SDK_INT >= 24 && DataStore.directBootAware &&

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

@@ -99,7 +99,7 @@ object NotificationUtil {
         val mainActivityName = "org.amnezia.vpn.qt.VPNActivity"
         val activity = Class.forName(mainActivityName)
         val intent = Intent(service, activity)
-        val pendingIntent = PendingIntent.getActivity(service, 0, intent, 0)
+        val pendingIntent = PendingIntent.getActivity(service, 0, intent, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
         // Build our notification
         sNotificationBuilder?.let {
             it.setSmallIcon(org.amnezia.vpn.R.drawable.ic_amnezia_round)

client/core/servercontroller.cpp

@@ -914,7 +914,7 @@ ErrorCode ServerController::getAlreadyInstalledContainers(const ServerCredential
         if (containerInfo.isEmpty()) {
             continue;
         }
-        const static QRegularExpression containerAndPortRegExp("(amnezia[-a-z]*).*?>([0-9]*)/(udp|tcp).*");
+        const static QRegularExpression containerAndPortRegExp("(amnezia[-a-z]*).*?:([0-9]*)->[0-9]*/(udp|tcp).*");
         QRegularExpressionMatch containerAndPortMatch = containerAndPortRegExp.match(containerInfo);
         if (containerAndPortMatch.hasMatch()) {
             QString name = containerAndPortMatch.captured(1);

client/server_scripts/install_docker.sh

@@ -6,4 +6,5 @@ if [[ -f "$pm_apt" ]]; then export DEBIAN_FRONTEND=noninteractive; fi;\
 if [[ -z "$docker_service" ]]; then sudo $pm update -y -q; sudo $pm install -y -q curl $docker_pkg; fi;\
 docker_service=$(systemctl list-units --full -all | grep docker.service | grep -v inactive | grep -v dead | grep -v failed);\
 if [[ -z "$docker_service" ]]; then sleep 5 && sudo systemctl start docker && sleep 5; fi;\
+if [[ -f "$pm_yum" ]]; then sudo systemctl enable docker && sudo systemctl start docker; fi;\
 docker --version

client/ui/pages_logic/ServerListLogic.cpp

@@ -21,6 +21,7 @@ void ServerListLogic::onServerListPushbuttonDefaultClicked(int index)
 void ServerListLogic::onServerListPushbuttonSettingsClicked(int index)
 {
     uiLogic()->m_selectedServerIndex = index;
+    uiLogic()->m_installCredentials = m_settings->serverCredentials(index);
     uiLogic()->goToPage(Page::ServerSettings);
 }
 

client/ui/qml/Pages/PageSetupWizardHighLevel.qml

@@ -54,12 +54,12 @@ You SHOULD set this website address to some foreign website which is not blocked
                 text: WizardLogic.lineEditHighWebsiteMaskingText
                 onEditingFinished: {
                     let _text = website_masking.text
-                    _text.replace("http://", "");
+                    _text = _text.replace("http://", "");
-                    _text.replace("https://", "");
+                    _text = _text.replace("https://", "");
                     if (!_text) {
                         return
                     }
-                    _text = _text.split("/").first();
+                    _text = _text.split("/")[0];
                     WizardLogic.lineEditHighWebsiteMaskingText = _text
                 }
                 onAccepted: {

client/vpnconnection.cpp

@@ -105,8 +105,8 @@ void VpnConnection::onConnectionStateChanged(VpnProtocol::VpnConnectionState sta
     }
     else {
         m_isIOSConnected = false;
-        m_receivedBytes = 0;
+//        m_receivedBytes = 0;
-        m_sentBytes = 0;
+//        m_sentBytes = 0;
     }
 #endif
     emit connectionStateChanged(state);