Merge branch 'development'

Pub/PubVersion.json

@@ -1,6 +1,6 @@
 {
-  "Version": "4.5.531",
-  "BumpTime": "2024-06-16T22:38:49.4194931Z",
+  "Version": "4.5.535",
+  "BumpTime": "2024-06-24T05:03:47.2884293Z",
   "Prerelease": false,
   "DeprecatedVersion": "4.0.00"
 }

Pub/PublishToGitHub.ps1

@@ -1,8 +1,5 @@
 . "$PSScriptRoot/Core/Common.ps1"
 
-# update maui nugets
-Push-Location -Path "$solutionDir/VpnHood.Client.App.Maui.Common";
-
 # update CHANGELOG
 $text = Get-Content "$solutionDir/CHANGELOG.md" -Raw;
 
@@ -19,7 +16,6 @@ $changeLog  | Out-File -FilePath "$solutionDir/CHANGELOG.md" -Encoding utf8 -For
 $releaseNote = $changeLog;
 $releaseNote = $releaseNote.SubString($releaseNote.IndexOf("`n")); # remove version tag
 $releaseNote = $releaseNote.SubString(0, $releaseNote.IndexOf("`n# ")); # remove other version
-# $releaseNote += "To see a list of all changes visit: [Changelog](https://github.com/vpnhood/VpnHood/blob/main/CHANGELOG.md)";
 $releaseNote | Out-File -FilePath "$packagesRootDir/ReleaseNote.txt" -Encoding utf8 -Force -NoNewline;
 if ($isLatest)
 {

Tests/VpnHood.Test/Tests/ClientAppTest.cs

@@ -455,7 +455,7 @@ public async Task IpFilters(bool usePassthru, bool isDnsServerSupported)
         // ************
         // *** TEST ***: Test Include ip filter
         app.UserSettings.IncludeIpRanges = customIps;
-        app.UserSettings.ExcludeIpRanges = null;
+        app.UserSettings.ExcludeIpRanges = [];
         await app.Connect(clientProfile.ClientProfileId);
         await TestHelper.WaitForAppState(app, AppConnectionState.Connected);
         await TestHelper.Test_Ping(ipAddress: TestConstants.PingV4Address1);
@@ -465,7 +465,7 @@ public async Task IpFilters(bool usePassthru, bool isDnsServerSupported)
 
         // ************
         // *** TEST ***: Test Exclude ip filters
-        app.UserSettings.IncludeIpRanges = null;
+        app.UserSettings.IncludeIpRanges = [];
         app.UserSettings.ExcludeIpRanges = customIps;
         await app.Connect(clientProfile.ClientProfileId);
         await TestHelper.WaitForAppState(app, AppConnectionState.Connected);

VpnHood.Client.App.Abstractions/VpnHood.Client.App.Abstractions.csproj

@@ -19,7 +19,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.531</Version>
+		<Version>4.5.535</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

VpnHood.Client.App.Android.Ads.AdMob/AdMobAppOpenAdService.cs

@@ -2,6 +2,7 @@
 using Android.Gms.Ads.AppOpen;
 using VpnHood.Client.App.Abstractions;
 using VpnHood.Client.App.Droid.Ads.VhAdMob.AdNetworkCallBackFix;
+using VpnHood.Client.App.Exceptions;
 using VpnHood.Client.Device;
 using VpnHood.Client.Device.Droid;
 using VpnHood.Common.Exceptions;
@@ -123,7 +124,10 @@ protected override void OnAdLoaded(AppOpenAd appOpenAd)
 
         public override void OnAdFailedToLoad(LoadAdError addError)
         {
-            _loadedCompletionSource.TrySetException(new LoadAdException(addError.Message));
+            _loadedCompletionSource.TrySetException(
+                addError.Message.Contains("No fill.", StringComparison.OrdinalIgnoreCase)
+                    ? new NoFillAdException(addError.Message)
+                    : new LoadAdException(addError.Message));
         }
     }
 

VpnHood.Client.App.Android.Ads.AdMob/AdMobInterstitialAdService.cs

@@ -1,6 +1,7 @@
 using Android.Gms.Ads;
 using Android.Gms.Ads.Interstitial;
 using VpnHood.Client.App.Abstractions;
+using VpnHood.Client.App.Exceptions;
 using VpnHood.Client.Device;
 using VpnHood.Client.Device.Droid;
 using VpnHood.Common.Exceptions;
@@ -111,7 +112,10 @@ protected override void OnAdLoaded(InterstitialAd interstitialAd)
 
         public override void OnAdFailedToLoad(LoadAdError addError)
         {
-            _loadedCompletionSource.TrySetException(new LoadAdException(addError.Message));
+            _loadedCompletionSource.TrySetException(
+                addError.Message.Contains("No fill.", StringComparison.OrdinalIgnoreCase)
+                    ? new NoFillAdException(addError.Message)
+                    : new LoadAdException(addError.Message));
         }
     }
 

VpnHood.Client.App.Android.Ads.AdMob/AdMobRewardedAdService.cs

@@ -1,6 +1,7 @@
 using Android.Gms.Ads;
 using Android.Gms.Ads.Rewarded;
 using VpnHood.Client.App.Abstractions;
+using VpnHood.Client.App.Exceptions;
 using VpnHood.Client.Device;
 using VpnHood.Client.Device.Droid;
 using VpnHood.Common.Exceptions;
@@ -110,9 +111,13 @@ protected override void OnAdLoaded(RewardedAd rewardedAd)
 
         public override void OnAdFailedToLoad(LoadAdError addError)
         {
-            _loadedCompletionSource.TrySetException(new LoadAdException(addError.Message));
+            _loadedCompletionSource.TrySetException(
+                addError.Message.Contains("No fill.", StringComparison.OrdinalIgnoreCase)
+                    ? new NoFillAdException(addError.Message)
+                    : new LoadAdException(addError.Message));
         }
     }
+
     private class MyFullScreenContentCallback : FullScreenContentCallback
     {
         private readonly TaskCompletionSource _dismissedCompletionSource = new();

VpnHood.Client.App.Android.Ads.AdMob/VpnHood.Client.App.Android.Ads.AdMob.csproj

@@ -21,7 +21,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.531</Version>
+		<Version>4.5.535</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>

VpnHood.Client.App.Android.Common/AndroidAppWebViewClient.cs

@@ -1,5 +1,7 @@
 using Android.Content;
 using Android.Webkit;
+using Microsoft.Extensions.Logging;
+using VpnHood.Common.Logging;
 
 namespace VpnHood.Client.App.Droid.Common;
 
@@ -23,9 +25,16 @@ public override bool ShouldOverrideUrlLoading(WebView? webView, string? url)
         if (uri.AbsolutePath == "/" || string.IsNullOrEmpty(uri.AbsolutePath))
             return false;
 
-        var intent = new Intent(Intent.ActionView, Android.Net.Uri.Parse(url));
-        intent.SetFlags(ActivityFlags.NewTask);
-        Application.Context.StartActivity(intent);
+        try
+        {
+            var intent = new Intent(Intent.ActionView, Android.Net.Uri.Parse(url));
+            intent.SetFlags(ActivityFlags.NewTask);
+            Application.Context.StartActivity(intent);
+        }
+        catch (Exception ex)
+        {
+            VhLogger.Instance.LogError(ex, $"Could not launch any activity for {url}");
+        }
 
         return true;
     }

VpnHood.Client.App.Android.Common/VpnHood.Client.App.Android.Common.csproj

@@ -21,7 +21,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.531</Version>
+		<Version>4.5.535</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>

VpnHood.Client.App.Android.Connect/App.cs

@@ -3,7 +3,6 @@
 using Firebase.Crashlytics;
 using Firebase;
 using VpnHood.Client.App.Droid.Ads.VhAdMob;
-using VpnHood.Client.App.Droid.Ads.VhUnityAds;
 using VpnHood.Client.App.Droid.Common;
 using VpnHood.Client.App.Droid.GooglePlay;
 using VpnHood.Client.App.Resources;
@@ -37,7 +36,7 @@ protected override AppOptions CreateAppOptions()
         var resources = DefaultAppResource.Resource;
         resources.Colors.NavigationBarColor = Color.FromArgb(100, 32, 25, 81);
         resources.Colors.WindowBackgroundColor = Color.FromArgb(100, 32, 25, 81);
-
+        
         return new AppOptions
         {
             StorageFolderPath = storageFolderPath,
@@ -52,7 +51,6 @@ protected override AppOptions CreateAppOptions()
             AdServices = [
                 AdMobInterstitialAdService.Create(appSettings.AdMobInterstitialAdUnitId, true),
                 AdMobInterstitialAdService.Create(appSettings.AdMobInterstitialNoVideoAdUnitId, false),
-                UnityAdService.Create(appSettings.UnityAdGameId, appSettings.UnityAdInterstitialPlacementId, AppSettings.IsDebugMode)
             ],
             UiService = new AndroidAppUiService()
         };

VpnHood.Client.App.Android.Connect/AppSettings.cs

@@ -11,7 +11,7 @@ internal class AppSettings : Singleton<AppSettings>
 
     // This is a test access key, you should replace it with your own access key.
     // It is limited and can not be used in production.
-    public string DefaultAccessKey { get; init; } = "vh://eyJ2Ijo0LCJuYW1lIjoiVnBuSG9vZCBTYW1wbGUiLCJzaWQiOiIxMzAwIiwidGlkIjoiYTM0Mjk4ZDktY2YwYi00MGEwLWI5NmMtZGJhYjYzMWQ2MGVjIiwiaWF0IjoiMjAyNC0wNi0xNFQyMjozMjo1NS44OTQ5ODAyWiIsInNlYyI6Im9wcTJ6M0M0ak9rdHNodXl3c0VKNXc9PSIsInNlciI6eyJjdCI6IjIwMjQtMDYtMDVUMDQ6MTU6MzZaIiwiaG5hbWUiOiJtby5naXdvd3l2eS5uZXQiLCJocG9ydCI6MCwiaXN2IjpmYWxzZSwic2VjIjoidmFCcVU5UkMzUUhhVzR4RjVpYllGdz09IiwiY2giOiIzZ1hPSGU1ZWN1aUM5cStzYk83aGxMb2tRYkE9IiwidXJsIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3Zwbmhvb2QvVnBuSG9vZC5GYXJtS2V5cy9tYWluL0ZyZWVfZW5jcnlwdGVkX3Rva2VuLnR4dCIsImVwIjpbIjUxLjgxLjIxMC4xNjQ6NDQzIiwiWzI2MDQ6MmRjMDoyMDI6MzAwOjo1Y2VdOjQ0MyJdLCJsb2MiOlsiVVMvT3JlZ29uIiwiVVMvVmlyZ2luaWEiXX19";
+    public string DefaultAccessKey { get; init; } = ClientOptions.SampleAccessKey;
 
     // Google sign-in (It is created through Firebase)
     public string GoogleSignInClientId { get; init; } = "000000000000-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.apps.googleusercontent.com"; //YOUR_FIREBASE_CLIENT_ID
@@ -24,7 +24,7 @@ internal class AppSettings : Singleton<AppSettings>
     // VpnHood Store server
     public Uri StoreBaseUri { get; init; } = new ("https://store-api.vpnhood.com");
     public Guid StoreAppId { get; init; } = Guid.Parse("00000000-0000-0000-0000-000000000000"); //YOUR_VPNHOOD_STORE_APP_ID
-    public bool StoreIgnoreSslVerification { get; init; }
+    public bool StoreIgnoreSslVerification { get; init; } = IsDebugMode;
 
     // AdMob
     // Default value is AdMob test AdUnit id, References: https://developers.google.com/admob/android/test-ads

VpnHood.Client.App.Android.Connect/VpnHood.Client.App.Android.Connect.csproj

@@ -5,8 +5,8 @@
 		<RootNamespace>VpnHood.Client.App.Droid.Connect</RootNamespace>
 		<OutputType>Exe</OutputType>
 		<ApplicationId>com.vpnhood.connect.android</ApplicationId>
-		<ApplicationVersion>530</ApplicationVersion>
-		<ApplicationDisplayVersion>4.5.530</ApplicationDisplayVersion>
+		<ApplicationVersion>534</ApplicationVersion>
+		<ApplicationDisplayVersion>4.5.534</ApplicationDisplayVersion>
 		<SupportedOSPlatformVersion>23.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
@@ -30,7 +30,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.530</Version>
+		<Version>4.5.534</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>
@@ -68,8 +68,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="VpnHood.Client.App.Android.Ads.UnityAds" Version="4.5.532" />
-		<PackageReference Include="Xamarin.Firebase.Crashlytics" Version="118.6.2.1" />
+		<PackageReference Include="Xamarin.Firebase.Crashlytics" Version="119.0.0" />
 	</ItemGroup>
 
 </Project>

VpnHood.Client.App.Android.GooglePlay.Core/GooglePlayAppUpdaterService.cs

@@ -86,7 +86,7 @@ public void OnStateUpdate(InstallState state)
                     break;
 
                 case InstallStatus.Canceled:
-                    _taskCompletionSource.SetCanceled();
+                    _taskCompletionSource.TrySetCanceled();
                     break;
 
                 case InstallStatus.Failed:

VpnHood.Client.App.Android.GooglePlay.Core/VpnHood.Client.App.Android.GooglePlay.Core.csproj

@@ -21,7 +21,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.531</Version>
+		<Version>4.5.535</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>

VpnHood.Client.App.Android.GooglePlay/VpnHood.Client.App.Android.GooglePlay.csproj

@@ -21,7 +21,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.531</Version>
+		<Version>4.5.535</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>
@@ -34,8 +34,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Xamarin.GooglePlayServices.Auth" Version="121.0.0.2" />
-		<PackageReference Include="Xamarin.Android.Google.BillingClient" Version="6.1.0.3" />
+		<PackageReference Include="Xamarin.GooglePlayServices.Auth" Version="121.1.1" />
+		<PackageReference Include="Xamarin.Android.Google.BillingClient" Version="6.2.1" />
 	</ItemGroup>
 
 	<ItemGroup>

VpnHood.Client.App.Android/App.cs

@@ -17,6 +17,7 @@ public class App(IntPtr javaReference, JniHandleOwnership transfer)
     protected override AppOptions CreateAppOptions() => new()
     {
         Resource = DefaultAppResource.Resource,
+        AccessKeys = AssemblyInfo.IsDebugMode ? [ClientOptions.SampleAccessKey] : [],
         UpdateInfoUrl = AssemblyInfo.UpdateInfoUrl,
         IsAddAccessKeySupported = true,
         UpdaterService = AssemblyInfo.CreateUpdaterService(),

VpnHood.Client.App.Android/VpnHood.Client.App.Android.csproj

@@ -5,8 +5,8 @@
 		<RootNamespace>VpnHood.Client.App.Droid</RootNamespace>
 		<OutputType>Exe</OutputType>
 		<ApplicationId>com.vpnhood.client.android.web</ApplicationId>
-		<ApplicationVersion>531</ApplicationVersion>
-		<ApplicationDisplayVersion>4.5.531</ApplicationDisplayVersion>
+		<ApplicationVersion>535</ApplicationVersion>
+		<ApplicationDisplayVersion>4.5.535</ApplicationDisplayVersion>
 		<SupportedOSPlatformVersion>23.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
@@ -30,7 +30,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.531</Version>
+		<Version>4.5.535</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>

VpnHood.Client.App.Maui.Common/VpnHood.Client.App.Maui.Common.csproj

@@ -30,7 +30,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.531</Version>
+		<Version>4.5.535</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseOutputPath></BaseOutputPath>
 		<BaseIntermediateOutputPath />

VpnHood.Client.App.Resources/VpnHood.Client.App.Resources.csproj

@@ -19,7 +19,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.531</Version>
+		<Version>4.5.535</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

VpnHood.Client.App.Store/VpnHood.Client.App.Store.csproj

@@ -19,7 +19,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.531</Version>
+		<Version>4.5.535</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 
@@ -35,7 +35,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="VpnHood.Store.Api" Version="1.0.39-alpha" />
+		<PackageReference Include="VpnHood.Store.Api" Version="1.0.47" />
 	</ItemGroup>
 
 </Project>

VpnHood.Client.App.WebServer/VpnHood.Client.App.WebServer.csproj

@@ -19,7 +19,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.531</Version>
+		<Version>4.5.535</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

VpnHood.Client.App.Win.Common/VpnHood.Client.App.Win.Common.csproj

@@ -19,7 +19,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.531</Version>
+		<Version>4.5.535</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj

@@ -27,7 +27,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>4.5.531</Version>
+		<Version>4.5.535</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 
@@ -48,7 +48,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
+		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
 	</ItemGroup>
 
 

VpnHood.Client.App/Exceptions/NoFillAdException.cs

@@ -0,0 +1,14 @@
+using VpnHood.Common.Exceptions;
+
+namespace VpnHood.Client.App.Exceptions;
+
+public class NoFillAdException : LoadAdException
+{
+    public NoFillAdException(string message) : base(message)
+    {
+    }
+
+    public NoFillAdException(string message, Exception innerException) : base(message, innerException)
+    {
+    }
+}