Merge branch 'development'

vpnhood · Oct 10, 2022 · 2563222 · 2563222
2 parents 0654955 + f591820
commit 2563222
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
-# v2.4.306
+# v2.4.307
+### Client
 * Feature: Add basic advertising support. Ouch!
 * Update: Upgrade to android 12.1
 
@@ -412,3 +413,4 @@
 
 
 
+
diff --git a/Pub/Version.json b/Pub/Version.json
@@ -1,6 +1,6 @@
 {
   "Major": 2,
   "Minor": 4,
-  "Build": 306,
-  "BumpTime": "2022-10-09T06:29:19.1292331Z"
+  "Build": 307,
+  "BumpTime": "2022-10-10T10:21:57.4871741Z"
 }
diff --git a/VpnHood.Client.App.Android/MainActivity.cs b/VpnHood.Client.App.Android/MainActivity.cs
@@ -105,7 +105,7 @@ private void ConnectionStateChanged(object sender, EventArgs e)
         // show ads
         var connectionState = VpnHoodApp.Instance.ConnectionState;
         if (connectionState == AppConnectionState.Connected && 
-            VpnHoodApp.Instance.LastActiveClientProfileId == Guid.Parse("{89cd723e-f73e-4637-98ae-811a56816dab}")) //todo: temporary public token
+            VpnHoodApp.Instance.ActiveClientProfile?.TokenId == Guid.Parse("{5aacec55-5cac-457a-acad-3976969236f8}")) //todo: temporary public token
         {
             Handler mainHandler = new Handler(MainLooper!);
             mainHandler.Post(InitAds);

diff --git a/VpnHood.Client.App.Android/Properties/AndroidManifest.xml b/VpnHood.Client.App.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="306" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.4.306">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="307" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.4.307">
   <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="32" />
   <uses-feature android:name="android.software.leanback" android:required="false" />
   <uses-feature android:name="android.hardware.touchscreen" android:required="false" />

diff --git a/VpnHood.Client.App.UI/VpnHood.Client.App.UI.csproj b/VpnHood.Client.App.UI/VpnHood.Client.App.UI.csproj
@@ -12,9 +12,9 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>Tiny internal webserver to server your single-page application (SPA). You need this only if you want to create a UI for your VpnHood client by single-page application (SPA).</Description>
     <PackageId>VpnHood.Client.App.UI</PackageId>
-    <Version>2.4.306</Version>
-    <AssemblyVersion>2.4.306</AssemblyVersion>
-    <FileVersion>2.4.306</FileVersion>
+    <Version>2.4.307</Version>
+    <AssemblyVersion>2.4.307</AssemblyVersion>
+    <FileVersion>2.4.307</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>

diff --git a/VpnHood.Client.App/VpnHood.Client.App.csproj b/VpnHood.Client.App/VpnHood.Client.App.csproj
@@ -11,9 +11,9 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <Description>Readymade Vpn App skeleton for VpnHood clients. You just need to create a UI on it.</Description>
     <PackageId>VpnHood.Client.App</PackageId>
-    <Version>2.4.306</Version>
-    <AssemblyVersion>2.4.306</AssemblyVersion>
-    <FileVersion>2.4.306</FileVersion>
+    <Version>2.4.307</Version>
+    <AssemblyVersion>2.4.307</AssemblyVersion>
+    <FileVersion>2.4.307</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>

diff --git a/VpnHood.Client.Device.WinDivert/VpnHood.Client.Device.WinDivert.csproj b/VpnHood.Client.Device.WinDivert/VpnHood.Client.Device.WinDivert.csproj
@@ -9,11 +9,11 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>VpnHood client device provider for Windows using WinDivert.</Description>
-    <Version>2.4.306</Version>
+    <Version>2.4.307</Version>
     <PackageId>VpnHood.Client.Device.WinDivert</PackageId>
     <Version>1.1.226</Version>
-    <AssemblyVersion>2.4.306</AssemblyVersion>
-    <FileVersion>2.4.306</FileVersion>
+    <AssemblyVersion>2.4.307</AssemblyVersion>
+    <FileVersion>2.4.307</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>

diff --git a/VpnHood.Client.Device/VpnHood.Client.Device.csproj b/VpnHood.Client.Device/VpnHood.Client.Device.csproj
@@ -14,9 +14,9 @@
     <RepositoryType></RepositoryType>
     <PackageId>VpnHood.Client.Device</PackageId>
     <RootNamespace>VpnHood.Client.Device</RootNamespace>
-    <Version>2.4.306</Version>
-    <AssemblyVersion>2.4.306</AssemblyVersion>
-    <FileVersion>2.4.306</FileVersion>
+    <Version>2.4.307</Version>
+    <AssemblyVersion>2.4.307</AssemblyVersion>
+    <FileVersion>2.4.307</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>

diff --git a/VpnHood.Client/VpnHood.Client.csproj b/VpnHood.Client/VpnHood.Client.csproj
@@ -13,9 +13,9 @@
     <Copyright>2020 VpnHood</Copyright>
     <PackageId>VpnHood.Client</PackageId>
     <PackageTags>VPN VpnClient Proxy</PackageTags>
-    <Version>2.4.306</Version>
-    <AssemblyVersion>2.4.306</AssemblyVersion>
-    <FileVersion>2.4.306</FileVersion>
+    <Version>2.4.307</Version>
+    <AssemblyVersion>2.4.307</AssemblyVersion>
+    <FileVersion>2.4.307</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>

diff --git a/VpnHood.Common/VpnHood.Common.csproj b/VpnHood.Common/VpnHood.Common.csproj
@@ -12,9 +12,9 @@
     <PackageId>VpnHood.Common</PackageId>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>VpnHood Common Library is shared among all other VpnHood modules.</Description>
-    <Version>2.4.306</Version>
-    <AssemblyVersion>2.4.306</AssemblyVersion>
-    <FileVersion>2.4.306</FileVersion>
+    <Version>2.4.307</Version>
+    <AssemblyVersion>2.4.307</AssemblyVersion>
+    <FileVersion>2.4.307</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>

diff --git a/VpnHood.Server.Access/VpnHood.Server.Access.csproj b/VpnHood.Server.Access/VpnHood.Server.Access.csproj
@@ -12,9 +12,9 @@
     <PackageId>VpnHood.Server.Access</PackageId>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>Stores, and retrieves end users' access and usage. Provides required interfaces and classes to use or create an access server and accounting.</Description>
-    <Version>2.4.306</Version>
-    <AssemblyVersion>2.4.306</AssemblyVersion>
-    <FileVersion>2.4.306</FileVersion>
+    <Version>2.4.307</Version>
+    <AssemblyVersion>2.4.307</AssemblyVersion>
+    <FileVersion>2.4.307</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>

diff --git a/VpnHood.Server/VpnHood.Server.csproj b/VpnHood.Server/VpnHood.Server.csproj
@@ -13,9 +13,9 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>The core of VpnHood server. It can listen and accept connections from VpnHood clients.</Description>
     <PackageId>VpnHood.Server</PackageId>
-    <Version>2.4.306</Version>
-    <AssemblyVersion>2.4.306</AssemblyVersion>
-    <FileVersion>2.4.306</FileVersion>
+    <Version>2.4.307</Version>
+    <AssemblyVersion>2.4.307</AssemblyVersion>
+    <FileVersion>2.4.307</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>

diff --git a/VpnHood.Tunneling/VpnHood.Tunneling.csproj b/VpnHood.Tunneling/VpnHood.Tunneling.csproj
@@ -15,9 +15,9 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Product>VpnHood.Tunneling</Product>
     <Description>Provides tunnelling classes and protocols shared between VpnHood.Client and VpnHood.Server.</Description>
-    <Version>2.4.306</Version>
-    <AssemblyVersion>2.4.306</AssemblyVersion>
-    <FileVersion>2.4.306</FileVersion>
+    <Version>2.4.307</Version>
+    <AssemblyVersion>2.4.307</AssemblyVersion>
+    <FileVersion>2.4.307</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>