Skip to content

Commit

Permalink
Publish v5.0.630
Browse files Browse the repository at this point in the history
  • Loading branch information
@trudyhood
trudyhood committed Dec 28, 2024
1 parent 5e9ed92 commit 9294705
Show file tree
Hide file tree
Showing 31 changed files with 40 additions and 37 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# v5.0.630
* Fix: Show old tokens
*
# v5.0.629
### Client
* Update: Improve logging by showing memory usage
Expand Down
4 changes: 2 additions & 2 deletions Pub/PubVersion.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Version": "5.0.629",
"BumpTime": "2024-12-27T09:53:08.9946847Z",
"Version": "5.0.630",
"BumpTime": "2024-12-28T02:10:59.6222613Z",
"Prerelease": false,
"DeprecatedVersion": "4.0.00"
}
2 changes: 1 addition & 1 deletion Src/AppLib/VpnHood.AppLib.Abstractions/VpnHood.AppLib.Abstractions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/AppLib/VpnHood.AppLib.Android.Ads.AdMob/VpnHood.AppLib.Android.Ads.AdMob.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
<BaseIntermediateOutputPath />
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Src/AppLib/VpnHood.AppLib.Android.Common/VpnHood.AppLib.Android.Common.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
<BaseIntermediateOutputPath />
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...pLib/VpnHood.AppLib.Android.GooglePlay.Core/VpnHood.AppLib.Android.GooglePlay.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
<BaseIntermediateOutputPath />
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Src/AppLib/VpnHood.AppLib.Android.GooglePlay/VpnHood.AppLib.Android.GooglePlay.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
<BaseIntermediateOutputPath />
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions Src/AppLib/VpnHood.AppLib.App/AppOptions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace VpnHood.AppLib;

public class AppOptions(string appId, bool isDebugMode)
{
public static string BuildStorageFolderPath(string appId) =>
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), appId, "storage");
public static string BuildStorageFolderPath(string appId, string subFolder = "storage") =>
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), appId, subFolder);

public string AppId => appId;
public bool IsDebugMode => isDebugMode;
Expand Down
2 changes: 1 addition & 1 deletion Src/AppLib/VpnHood.AppLib.App/ClientProfiles/ClientProfileInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class ClientProfileInfo(ClientProfile clientProfile)
public string? SupportId => clientProfile.Token.SupportId;
public string? CustomData => clientProfile.CustomData;
public bool IsPremiumLocationSelected => clientProfile.IsPremiumLocationSelected;
public bool IsPremiumAccount => clientProfile.IsPremium && VpnHoodApp.Instance.Features.IsPremiumFlagSupported; //todo move to UI
public bool IsPremiumAccount => clientProfile.IsPremium;
public string TokenId => clientProfile.Token.TokenId;
public string[] HostNames => GetEndPoints(clientProfile.Token.ServerToken);
public bool IsValidHostName => clientProfile.Token.ServerToken.IsValidHostName;
Expand Down
2 changes: 1 addition & 1 deletion Src/AppLib/VpnHood.AppLib.App/VpnHood.AppLib.App.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/AppLib/VpnHood.AppLib.Resources/VpnHood.AppLib.Resources.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/AppLib/VpnHood.AppLib.Store/VpnHood.AppLib.Store.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/AppLib/VpnHood.AppLib.WebServer/VpnHood.AppLib.WebServer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/AppLib/VpnHood.AppLib.Win.Common.WpfSpa/VpnHood.AppLib.Win.Common.WpfSpa.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/AppLib/VpnHood.AppLib.Win.Common/VpnHood.AppLib.Win.Common.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/Apps/Client.Android.Google/App.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ protected override AppOptions CreateAppOptions()
resources.Strings.AppName = AppConfigs.AppName;

return new AppOptions(PackageName!, AppConfigs.IsDebugMode) {
StorageFolderPath = AppOptions.BuildStorageFolderPath(appId: "VpnHood"), // for compatibility with old versions
StorageFolderPath = AppOptions.BuildStorageFolderPath(appId: "VpnHood", subFolder: ""), // for compatibility with old versions
Resource = resources,
AccessKeys = appConfigs.DefaultAccessKey != null ? [appConfigs.DefaultAccessKey] : [],
UpdateInfoUrl = appConfigs.UpdateInfoUrl,
Expand Down
6 changes: 3 additions & 3 deletions Src/Apps/Client.Android.Google/VpnHood.App.Client.Android.Google.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<RootNamespace>VpnHood.App.Client.Droid.Google</RootNamespace>
<OutputType>Exe</OutputType>
<ApplicationId>com.vpnhood.client.android.debug</ApplicationId>
<ApplicationVersion>629</ApplicationVersion>
<ApplicationDisplayVersion>5.0.629</ApplicationDisplayVersion>
<ApplicationVersion>630</ApplicationVersion>
<ApplicationDisplayVersion>5.0.630</ApplicationDisplayVersion>
<SupportedOSPlatformVersion>23.0</SupportedOSPlatformVersion>
</PropertyGroup>

Expand All @@ -32,7 +32,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
<BaseIntermediateOutputPath />
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions Src/Apps/Client.Android.Web/App.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace VpnHood.App.Client.Droid.Web;
Icon = AndroidAppConstants.Icon,
Banner = AndroidAppConstants.Banner,
NetworkSecurityConfig = AndroidAppConstants.NetworkSecurityConfig,
SupportsRtl = AndroidAppConstants.SupportsRtl,
SupportsRtl = AndroidAppConstants.SupportsRtl,
AllowBackup = AndroidAppConstants.AllowBackup)]
public class App(IntPtr javaReference, JniHandleOwnership transfer)
: VpnHoodAndroidApp(javaReference, transfer)
Expand All @@ -24,7 +24,7 @@ protected override AppOptions CreateAppOptions()
resources.Strings.AppName = AppConfigs.AppName;

return new AppOptions(PackageName!, AppConfigs.IsDebugMode) {
StorageFolderPath = AppOptions.BuildStorageFolderPath(appId: "VpnHood"), // for compatibility with old VpnHood app versions to keep tokens
StorageFolderPath = AppOptions.BuildStorageFolderPath(appId: "VpnHood", subFolder: ""), // for compatibility with old VpnHood app versions to keep tokens
Resource = resources,
AccessKeys = appConfigs.DefaultAccessKey != null ? [appConfigs.DefaultAccessKey] : [],
UpdateInfoUrl = appConfigs.UpdateInfoUrl,
Expand Down
6 changes: 3 additions & 3 deletions Src/Apps/Client.Android.Web/VpnHood.App.Client.Android.Web.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<RootNamespace>VpnHood.App.Client.Droid.Web</RootNamespace>
<OutputType>Exe</OutputType>
<ApplicationId>com.vpnhood.connect.android.web.debug</ApplicationId>
<ApplicationVersion>629</ApplicationVersion>
<ApplicationDisplayVersion>5.0.629</ApplicationDisplayVersion>
<ApplicationVersion>630</ApplicationVersion>
<ApplicationDisplayVersion>5.0.630</ApplicationDisplayVersion>
<SupportedOSPlatformVersion>23.0</SupportedOSPlatformVersion>
</PropertyGroup>

Expand All @@ -32,7 +32,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
<BaseIntermediateOutputPath />
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Src/Apps/Client.Win.Web/App.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ protected override AppOptions CreateAppOptions()

return new AppOptions("com.vpnhood.client.windows", AppConfigs.IsDebugMode) {
DeviceId = WindowsIdentity.GetCurrent().User?.Value,
StorageFolderPath = AppOptions.BuildStorageFolderPath(appId: "VpnHood"),
StorageFolderPath = AppOptions.BuildStorageFolderPath(appId: "VpnHood", subFolder: ""),
Resource = resources,
AccessKeys = AppConfigs.IsDebugMode ? [appConfigs.DefaultAccessKey] : [],
UpdateInfoUrl = appConfigs.UpdateInfoUrl,
Expand Down
2 changes: 1 addition & 1 deletion Src/Apps/Client.Win.Web/VpnHood.App.Client.Win.Web.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/Core/VpnHood.Core.Client.Device.Android/AndroidPacketCapture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ namespace VpnHood.Core.Client.Device.Droid;
[IntentFilter(["android.net.VpnService"])]
public class AndroidPacketCapture : VpnService, IPacketCapture
{
public const string VpnServiceName = "VhSession";
private IPAddress[]? _dnsServers;
private FileInputStream? _inStream; // Packets to be sent are queued in this input stream.
private ParcelFileDescriptor? _mInterface;
Expand All @@ -44,6 +43,7 @@ public class AndroidPacketCapture : VpnService, IPacketCapture
public bool CanIncludeApps => true;
public string[]? ExcludeApps { get; set; }
public string[]? IncludeApps { get; set; }
public string VpnServiceName { get; set; } = "VhSession";
public bool IsMtuSupported => true;

public int Mtu {
Expand Down
2 changes: 1 addition & 1 deletion Src/Core/VpnHood.Core.Client.Device.Android/VpnHood.Core.Client.Device.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/Core/VpnHood.Core.Client.Device.WinDivert/VpnHood.Core.Client.Device.WinDivert.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/Core/VpnHood.Core.Client.Device/VpnHood.Core.Client.Device.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/Core/VpnHood.Core.Client/VpnHood.Core.Client.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/Core/VpnHood.Core.Common/VpnHood.Core.Common.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ....Core.Server.Access.FileAccessManager/VpnHood.Core.Server.Access.FileAccessManager.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/Core/VpnHood.Core.Server.Access/VpnHood.Core.Server.Access.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/Core/VpnHood.Core.Server/VpnHood.Core.Server.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Src/Core/VpnHood.Core.Tunneling/VpnHood.Core.Tunneling.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageIcon>VpnHood.png</PackageIcon>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<Version>5.0.629</Version>
<Version>5.0.630</Version>
<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
</PropertyGroup>

Expand Down

0 comments on commit 9294705

Please sign in to comment.