Skip to content

Commit

Permalink
Merge branch 'release/1.25.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
mindaugasveblauskas committed Jan 14, 2022
2 parents 2a7efc9 + 97aa924 commit e24f7ba
Show file tree
Hide file tree
Showing 177 changed files with 5,518 additions and 1,221 deletions.
6 changes: 5 additions & 1 deletion COPYING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ ProtonVPN Windows app includes the following 3rd party software:
| [The MIT License](https://github.com/davideicardi/DynamicExpresso/blob/master/LICENSE).
* [FontAwesome.WPF](https://github.com/charri/Font-Awesome-WPF/) by charri
| [The MIT License](https://github.com/charri/Font-Awesome-WPF/blob/master/LICENSE).
* [Gu.Wpf.Adorners](https://github.com/GuOrg/Gu.Wpf.Adorners) by Johan Larsson
| [The MIT License](https://github.com/GuOrg/Gu.Wpf.Adorners/blob/master/LICENSE).
* [MvvmLightLibsStd10](http://www.mvvmlight.net/) by Laurent Bugnion (GalaSoft)
| [The MIT License](https://github.com/lbugnion/mvvmlight/blob/master/LICENSE).
* [Newtonsoft.Json](https://www.newtonsoft.com/json) by James Newton-King
Expand Down Expand Up @@ -83,4 +85,6 @@ ProtonVPN Windows app includes the following 3rd party software:
* [System.Buffers](https://dot.net) by Microsoft
| [The MIT License](https://github.com/dotnet/corefx/blob/master/LICENSE.TXT).
* [System.Collections.Immutable](https://dot.net) by Microsoft
| [The MIT License](https://github.com/dotnet/corefx/blob/master/LICENSE.TXT).
| [The MIT License](https://github.com/dotnet/corefx/blob/master/LICENSE.TXT).
* [WpfScreenHelper](https://github.com/micdenny/WpfScreenHelper) by Michael Denny
| [The MIT License](https://github.com/micdenny/WpfScreenHelper/blob/master/LICENSE).
6 changes: 6 additions & 0 deletions Setup/ProtonVPN.aip
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
<ROW Component="GalaSoft.MvvmLight.dll" ComponentId="{50FA9CA8-4DD4-4068-A0D8-D2C1D9D42947}" Directory_="APPDIR" Attributes="0" KeyPath="GalaSoft.MvvmLight.dll"/>
<ROW Component="GoSrp.dll" ComponentId="{3DB767E8-ACF9-459F-A509-F57E76FBA633}" Directory_="x64_Dir" Attributes="256" KeyPath="GoSrp.dll"/>
<ROW Component="GoSrp.dll_1" ComponentId="{89CC2AA9-0000-4E4B-9D5A-43ACC1B1D1E3}" Directory_="x86_Dir" Attributes="0" KeyPath="GoSrp.dll_1"/>
<ROW Component="Gu.Wpf.Adorners.dll" ComponentId="{01DC8E24-C053-41CC-A726-5F4729DE78DD}" Directory_="APPDIR" Attributes="0" KeyPath="Gu.Wpf.Adorners.dll"/>
<ROW Component="GuestHoleServers.json" ComponentId="{C5ACA4D0-1647-4D3A-B9CD-9FE054A81588}" Directory_="ProtonVPN_1_Dir" Attributes="0" KeyPath="GuestHoleServers.json" Type="0"/>
<ROW Component="LocalAgent.dll" ComponentId="{25183BB4-5B07-43F9-8BEB-D58230BAEB78}" Directory_="bit_Dir" Attributes="0" KeyPath="LocalAgent.dll"/>
<ROW Component="LocalAgent.dll_1" ComponentId="{73CCCE7C-D519-40C3-8AAA-FB879005DFA4}" Directory_="bit_1_Dir" Attributes="256" KeyPath="LocalAgent.dll_1"/>
Expand Down Expand Up @@ -165,6 +166,7 @@
<ROW Component="TapInstaller.dll" ComponentId="{6C0E1AC7-D393-43D7-8842-549A396829EB}" Directory_="APPDIR" Attributes="0" KeyPath="TapInstaller.dll"/>
<ROW Component="WebView2Loader.dll_1" ComponentId="{2EA095EA-C501-4A0B-B50D-FFF6383F6077}" Directory_="native_1_Dir" Attributes="256" KeyPath="WebView2Loader.dll_1"/>
<ROW Component="WebView2Loader.dll_2" ComponentId="{7B52FD4C-77FC-441E-830E-31363BA5A2A6}" Directory_="native_2_Dir" Attributes="0" KeyPath="WebView2Loader.dll_2"/>
<ROW Component="WpfScreenHelper.dll" ComponentId="{D9BC0004-B4FA-4D5B-B94A-1F8525D2E2FA}" Directory_="APPDIR" Attributes="0" KeyPath="WpfScreenHelper.dll"/>
<ROW Component="config.ovpn" ComponentId="{0B387BF9-0755-4C70-81A5-48180795855C}" Directory_="Binaries_Dir" Attributes="0" KeyPath="config.ovpn" Type="0"/>
<ROW Component="libcrypto1_1.dll" ComponentId="{F5111CFC-D038-4A4A-927B-F4FA1D0463C9}" Directory_="bit_Dir" Attributes="0" KeyPath="libcrypto1_1.dll"/>
<ROW Component="libcrypto1_1x64.dll" ComponentId="{9BA46CFB-D246-4182-9AFB-3CA5D2A29D53}" Directory_="bit_1_Dir" Attributes="256" KeyPath="libcrypto1_1x64.dll"/>
Expand Down Expand Up @@ -285,6 +287,8 @@
<ROW File="wireguard.dll" Component_="wireguard.dll" FileName="WIREGU~1.DLL|wireguard.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\src\ProtonVPN.Vpn\Resources\64-bit\wireguard.dll" SelfReg="false"/>
<ROW File="wireguard.dll_1" Component_="wireguard.dll_1" FileName="WIREGU~1.DLL|wireguard.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\src\ProtonVPN.Vpn\Resources\32-bit\wireguard.dll" SelfReg="false"/>
<ROW File="ProtonVPN.WireGuardDriver.dll" Component_="ProtonVPN.WireGuardDriver.dll" FileName="PROTO~13.DLL|ProtonVPN.WireGuardDriver.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\src\bin\ProtonVPN.WireGuardDriver.dll" SelfReg="false"/>
<ROW File="Gu.Wpf.Adorners.dll" Component_="Gu.Wpf.Adorners.dll" FileName="GUWPFA~1.DLL|Gu.Wpf.Adorners.dll" Attributes="0" SourcePath="..\src\bin\Gu.Wpf.Adorners.dll" SelfReg="false"/>
<ROW File="WpfScreenHelper.dll" Component_="WpfScreenHelper.dll" FileName="WPFSCR~1.DLL|WpfScreenHelper.dll" Attributes="0" SourcePath="..\src\bin\WpfScreenHelper.dll" SelfReg="false"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.AiRemoveFileComponent">
<ROW RemoveFile="_" Condition="(AI_CLEAN_RESOURCES_UNINSTALL = &quot;1&quot;) AND (NOT UPGRADINGPRODUCTCODE)" Options="3"/>
Expand Down Expand Up @@ -658,6 +662,8 @@
<ROW Feature_="MainFeature" Component_="wireguard.dll"/>
<ROW Feature_="MainFeature" Component_="wireguard.dll_1"/>
<ROW Feature_="MainFeature" Component_="ProtonVPN.WireGuardDriver.dll"/>
<ROW Feature_="MainFeature" Component_="Gu.Wpf.Adorners.dll"/>
<ROW Feature_="MainFeature" Component_="WpfScreenHelper.dll"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
<ROW Name="protonvpn.exe" SourcePath="images\protonvpn.ico" Index="0"/>
Expand Down
6 changes: 3 additions & 3 deletions src/GlobalAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ProtonVPN")]
[assembly: AssemblyCopyright("Copyright © 2021 Proton Technologies AG")]
[assembly: AssemblyCopyright("Copyright © 2021 Proton Technologies AG")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: AssemblyVersion("1.24.2.0")]
[assembly: AssemblyFileVersion("1.24.2.0")]
[assembly: AssemblyVersion("1.25.0.0")]
[assembly: AssemblyFileVersion("1.25.0.0")]
[assembly: ComVisible(false)]
[assembly: AssemblyInformationalVersion("$AssemblyVersion")]
8 changes: 2 additions & 6 deletions src/ProtonVPN.App/About/UpdateViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2021 Proton Technologies AG
*
* This file is part of ProtonVPN.
*
Expand All @@ -23,14 +23,13 @@
using System.Windows;
using System.Windows.Input;
using GalaSoft.MvvmLight.Command;
using ProtonVPN.BugReporting.Diagnostic;
using ProtonVPN.Common.KillSwitch;
using ProtonVPN.Common.OS.Processes;
using ProtonVPN.Common.Vpn;
using ProtonVPN.Core.Modals;
using ProtonVPN.Core.MVVM;
using ProtonVPN.Core.OS;
using ProtonVPN.Core.Service.Settings;
using ProtonVPN.Core.Service.Vpn;
using ProtonVPN.Core.Settings;
using ProtonVPN.Core.Update;
using ProtonVPN.Core.Vpn;
Expand All @@ -45,7 +44,6 @@ public class UpdateViewModel : ViewModel, IUpdateStateAware, IVpnStateAware
private readonly IOsProcesses _osProcesses;
private readonly IModals _modals;
private readonly IAppSettings _appSettings;
private readonly IVpnServiceManager _vpnServiceManager;
private readonly ISystemState _systemState;
private readonly ISettingsServiceClientManager _settingsServiceClientManager;

Expand All @@ -57,15 +55,13 @@ public UpdateViewModel(
IOsProcesses osProcesses,
IModals modals,
IAppSettings appSettings,
IVpnServiceManager vpnServiceManager,
ISystemState systemState,
ISettingsServiceClientManager settingsServiceClientManager)
{
_dialogs = dialogs;
_osProcesses = osProcesses;
_modals = modals;
_appSettings = appSettings;
_vpnServiceManager = vpnServiceManager;
_systemState = systemState;
_settingsServiceClientManager = settingsServiceClientManager;

Expand Down
3 changes: 3 additions & 0 deletions src/ProtonVPN.App/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,9 @@
<setting name="HardwareAccelerationEnabled" serializeAs="String">
<value>True</value>
</setting>
<setting name="UserReportAnIssueFormData" serializeAs="String">
<value />
</setting>
</ProtonVPN.Properties.Settings>
</userSettings>

Expand Down
14 changes: 1 addition & 13 deletions src/ProtonVPN.App/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2021 Proton Technologies AG
*
* This file is part of ProtonVPN.
*
Expand All @@ -25,7 +25,6 @@
using System.Threading.Tasks;
using System.Windows;
using Microsoft.Toolkit.Uwp.Notifications;
using ProtonVPN.Common.Cli;
using ProtonVPN.Common.Configuration;
using ProtonVPN.Common.CrashReporting;
using ProtonVPN.Common.Extensions;
Expand Down Expand Up @@ -83,8 +82,6 @@ private static async Task Run(string[] args)
_bootstrapper = new Bootstrapper(args);
_bootstrapper.Initialize();

HandleIntentionalCrash(app, args);

app.Run();
}
}
Expand Down Expand Up @@ -150,15 +147,6 @@ private static Common.Configuration.Config GetConfig()
return config;
}

private static void HandleIntentionalCrash(Application app, string[] args)
{
var option = new CommandLineOption("crash", args);
if (!option.Exists())
return;

app.Deactivated += (sender, ea) => throw new StackOverflowException("Intentional crash test");
}

private static void SetDllDirectories()
{
Kernel32.SetDefaultDllDirectories(Kernel32.SetDefaultDllDirectoriesFlags.LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
Expand Down
31 changes: 31 additions & 0 deletions src/ProtonVPN.App/BugReporting/Actions/CategoryAction.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* Copyright (c) 2021 Proton Technologies AG
*
* This file is part of ProtonVPN.
*
* ProtonVPN is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ProtonVPN is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
*/

namespace ProtonVPN.BugReporting.Actions
{
public abstract class CategoryAction
{
public string Category { get; }

protected CategoryAction(string category)
{
Category = category;
}
}
}
28 changes: 28 additions & 0 deletions src/ProtonVPN.App/BugReporting/Actions/FillTheFormAction.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
* Copyright (c) 2021 Proton Technologies AG
*
* This file is part of ProtonVPN.
*
* ProtonVPN is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ProtonVPN is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
*/

namespace ProtonVPN.BugReporting.Actions
{
public class FillTheFormAction : CategoryAction
{
public FillTheFormAction(string category) : base(category)
{
}
}
}
26 changes: 26 additions & 0 deletions src/ProtonVPN.App/BugReporting/Actions/FinishReportAction.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* Copyright (c) 2021 Proton Technologies AG
*
* This file is part of ProtonVPN.
*
* ProtonVPN is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ProtonVPN is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
*/


namespace ProtonVPN.BugReporting.Actions
{
public class FinishReportAction
{
}
}
31 changes: 31 additions & 0 deletions src/ProtonVPN.App/BugReporting/Actions/FormStateChange.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* Copyright (c) 2021 Proton Technologies AG
*
* This file is part of ProtonVPN.
*
* ProtonVPN is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ProtonVPN is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
*/

namespace ProtonVPN.BugReporting.Actions
{
public class FormStateChange
{
public FormStateChange(FormState state)
{
State = state;
}

public FormState State { get; }
}
}
25 changes: 25 additions & 0 deletions src/ProtonVPN.App/BugReporting/Actions/GoBackAfterFailureAction.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright (c) 2021 Proton Technologies AG
*
* This file is part of ProtonVPN.
*
* ProtonVPN is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ProtonVPN is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
*/

namespace ProtonVPN.BugReporting.Actions
{
public class GoBackAfterFailureAction
{
}
}
25 changes: 25 additions & 0 deletions src/ProtonVPN.App/BugReporting/Actions/RetryAction.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright (c) 2021 Proton Technologies AG
*
* This file is part of ProtonVPN.
*
* ProtonVPN is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ProtonVPN is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
*/

namespace ProtonVPN.BugReporting.Actions
{
public class RetryAction
{
}
}
28 changes: 28 additions & 0 deletions src/ProtonVPN.App/BugReporting/Actions/SelectCategoryAction.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
* Copyright (c) 2021 Proton Technologies AG
*
* This file is part of ProtonVPN.
*
* ProtonVPN is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ProtonVPN is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
*/

namespace ProtonVPN.BugReporting.Actions
{
public class SelectCategoryAction : CategoryAction
{
public SelectCategoryAction(string category) : base(category)
{
}
}
}
Loading

0 comments on commit e24f7ba

Please sign in to comment.