Merge branch 'release/3.5.3'

Author: Mindaugas Veblauskas

CODEOWNERS

@@ -0,0 +1,2 @@
+# ownership: loose
+*	@ProtonVPN/groups/windows-developers

Setup/SetupBase.iss

@@ -83,13 +83,11 @@ Source: "..\{#SourcePath}\*.deps.json"; DestDir: "{app}\{#VersionFolder}";
 Source: "..\{#SourcePath}\*.dll.config"; DestDir: "{app}\{#VersionFolder}";
 Source: "..\{#SourcePath}\Resources\ProtonVPN.InstallActions.dll"; DestDir: "{app}\{#VersionFolder}"; Flags: signonce;
 
-Source: "..\{#SourcePath}\en-US\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\en-US"; Flags: signonce;
 Source: "..\{#SourcePath}\cs-CZ\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\cs-CZ"; Flags: signonce;
 Source: "..\{#SourcePath}\de-DE\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\de-DE"; Flags: signonce;
 Source: "..\{#SourcePath}\fa-IR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\fa-IR"; Flags: signonce;
 Source: "..\{#SourcePath}\fr-FR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\fr-FR"; Flags: signonce;
 Source: "..\{#SourcePath}\nl-NL\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\nl-NL"; Flags: signonce;
-Source: "..\{#SourcePath}\hr-HR\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\hr-HR"; Flags: signonce;
 Source: "..\{#SourcePath}\id-ID\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\id-ID"; Flags: signonce;
 Source: "..\{#SourcePath}\it-IT\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\it-IT"; Flags: signonce;
 Source: "..\{#SourcePath}\pl-PL\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\pl-PL"; Flags: signonce;
@@ -110,7 +108,6 @@ Source: "..\{#SourcePath}\zh-TW\ProtonVPN.Translations.resources.dll"; DestDir:
 Source: "..\{#SourcePath}\sv-SE\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\sv-SE"; Flags: signonce;
 Source: "..\{#SourcePath}\ja-JP\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\ja-JP"; Flags: signonce;
 Source: "..\{#SourcePath}\sk-SK\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\sk-SK"; Flags: signonce;
-Source: "..\{#SourcePath}\nn-NO\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\nn-NO"; Flags: signonce;
 Source: "..\{#SourcePath}\nb-NO\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\nb-NO"; Flags: signonce;
 Source: "..\{#SourcePath}\sl-SI\ProtonVPN.Translations.resources.dll"; DestDir: "{app}\{#VersionFolder}\sl-SI"; Flags: signonce;
 
@@ -354,7 +351,7 @@ begin
     ProductDriveCheckBox.Left := ScaleX(Padding);
     ProductDriveCheckBox.Width := ScaleX(14);
     ProductDriveCheckBox.Height := ScaleY(14);
-    ProductDriveCheckBox.Checked := not IsProductDriveInstalled and not IsArm64; // Drive doesn't work on arm64
+    ProductDriveCheckBox.Checked := not IsProductDriveInstalled;
 
     ProductDriveImage := TBitmapImage.Create(ProductDrivePanel);
     ProductDriveImage.Parent := ProductDrivePanel;
@@ -386,8 +383,7 @@ begin
     ProductDrivePanelOverlay.Transparent := True;
     ProductDrivePanelOverlay.OnClick := @OnProductDriveClick;
 
-    // Drive doesn't work on arm64
-    if IsProductDriveInstalled or IsArm64 then begin
+    if IsProductDriveInstalled then begin
       ProductDrivePanel.Visible := False;
       ProductDrivePanel.Height := 0;
       ProductPadding := 0;

ci/build-scripts/guest_hole_server_loader.py

@@ -30,7 +30,7 @@ def load():
     random.shuffle(non_secure_core_logical_servers)
 
     servers_str: str = ""
-    unique_entries: array = []
+    unique_entries: list = []
 
     for logical_server in non_secure_core_logical_servers:
         server = logical_server['Servers'][0]
@@ -51,7 +51,7 @@ def load():
 
     servers_str = servers_str.lstrip(',')
 
-    with open('.\Setup\GuestHoleServers.json', 'w') as file:
+    with open(r'.\Setup\GuestHoleServers.json', 'w') as file:
         file.write("".join(['[', servers_str, ']']))
 
     print('Finished updating guest hole servers json')

ci/build-scripts/installer.py

@@ -1,7 +1,6 @@
 import os
 import re
 import subprocess
-import pathlib
 
 def build(version, hash, setupFile):
 
@@ -21,7 +20,7 @@ def createSetupFile(version, hash):
     with open(baseSetupFile, 'r') as file:
         fileData = file.read()
 
-    fileData = re.sub('(#define MyAppVersion \")([0-9+]\.[0-9+]\.[0-9+])(\".+)', rf'\g<1>{version}\3', fileData, 1, flags = re.M | re.DOTALL)
+    fileData = re.sub(r'(#define MyAppVersion \")([0-9+]\.[0-9+]\.[0-9+])(\".+)', rf'\g<1>{version}\3', fileData, 1, flags = re.M | re.DOTALL)
 
     if hash:
         fileData = fileData.replace('#define Hash ""', "#define Hash \"{hash}\"".format(hash=hash))

ci/build-scripts/main.py

@@ -3,13 +3,11 @@
 import os
 import argparse
 import win32api
-import config
 import installer
 import ssh
 import guest_hole_server_loader
 import slack
 import hashlib
-from pathlib import Path
 
 def get_sha256(file_path):
     sha256_hash = hashlib.sha256()
@@ -74,13 +72,13 @@ def print_sha256(file_path):
 
     if 'BTI' in build_path:
         installer_filename = 'ProtonVPN_v{semVersion}_{platform}_BTI.exe'.format(semVersion=semVersion, platform=args.platform)
-    installer_path = os.path.join('.\Setup\Installers', installer_filename)
+    installer_path = os.path.join(r'.\Setup\Installers', installer_filename)
 
     print_sha256(installer_path)
     sys.exit(err)
 
 elif args.command == 'add-commit-hash':
-    path = '.\src\GlobalAssemblyInfo.cs'
+    path = r'.\src\GlobalAssemblyInfo.cs'
     with open(path, 'r') as file:
         content = file.read()
         matches = re.search(r"AssemblyVersion\(\"([0-9]+.[0-9]+.[0-9]+)", content)

ci/build-scripts/slack.py

@@ -12,8 +12,8 @@ def send():
     if len(files) > 0:
         installer_path = files[0]
         try:
-            result = client.files_upload(
-                channels=os.environ.get("SLACK_CHANNEL_ID"),
+            result = client.files_upload_v2(
+                channel=os.environ.get("SLACK_CHANNEL_ID"),
                 initial_comment=os.environ.get("CI_COMMIT_MESSAGE"),
                 file=installer_path,
             )

ci/build-scripts/ssh.py

@@ -1,9 +1,9 @@
 import os
 
 def prepare(key):
-    path = '{userprofile}\.ssh'.format(userprofile=os.getenv('userprofile'))
+    path = os.path.join(os.getenv('userprofile'), '.ssh')
     os.makedirs(path, exist_ok=True)
-    f = open(path + '\id_rsa', 'w', newline='\n')
+    f = open(os.path.join(path, 'id_rsa'), 'w', newline='\n')
     f.write(key)
     f.write('\n')
     f.close()

ci/python-libs.txt

@@ -1,3 +1,3 @@
 pywin32==228
 requests==2.24.0
-slack_sdk==3.15.2
+slack_sdk==3.34.0