Publish v1.1.236

vpnhood · Apr 7, 2021 · 6c605f2 · 6c605f2
1 parent a0ec977
commit 6c605f2
Show file tree

Hide file tree

Showing 19 changed files with 2,592 additions and 5,885 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
-# upcoming
+# v1.1.236
 ### Client
 * Fix: Android: Crash when sending feedback on Android 11
 * Fix: Connection already in progress error when changing server
+* Update: Show traffic speed
 
 ### Server
 * Update: Auto restart if VpnHoodServer stops unexpectedly
-* Fix: Type error in default.pfx filename for FileAccessServer
+* Fix: Typo error in default.pfx filename for FileAccessServer
 * Fix: linux: Stop working after server update
 
 # v1.1.235
@@ -161,5 +162,6 @@
 
 
 
+
 
 
diff --git a/Pub/Version.json b/Pub/Version.json
diff --git a/VpnHood.App.Launcher/VpnHood.App.Launcher.csproj b/VpnHood.App.Launcher/VpnHood.App.Launcher.csproj
@@ -15,9 +15,9 @@
     <Product>VpnHood.App.Launcher</Product>
     <LangVersion>default</LangVersion>
     <ApplicationIcon>Resources\VpnHood.ico</ApplicationIcon>
-    <Version>1.1.235</Version>
-    <AssemblyVersion>1.1.235</AssemblyVersion>
-    <FileVersion>1.1.235</FileVersion>
+    <Version>1.1.236</Version>
+    <AssemblyVersion>1.1.236</AssemblyVersion>
+    <FileVersion>1.1.236</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Client.App.Android/Assets/SPA.zip b/VpnHood.Client.App.Android/Assets/SPA.zip
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="235" android:versionName="Beta" package="com.vpnhood.client.android" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="236" android:versionName="Beta" package="com.vpnhood.client.android" android:installLocation="auto">
   <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="30" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -8,11 +8,11 @@
   <queries>
     <intent>
       <action android:name="android.intent.action.VIEW" />
-      <data android:scheme="http"/>
+      <data android:scheme="http" />
     </intent>
     <intent>
       <action android:name="android.intent.action.VIEW" />
-      <data android:scheme="https"/>
+      <data android:scheme="https" />
     </intent>
   </queries>
 </manifest>
diff --git a/VpnHood.Client.App.UI.Html/package-lock.json b/VpnHood.Client.App.UI.Html/package-lock.json
diff --git a/VpnHood.Client.App.UI.Html/package.json b/VpnHood.Client.App.UI.Html/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vpnhood-spa",
-  "version": "1.0.89",
+  "version": "1.0.92",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -16,7 +16,7 @@
     "js-base64": "^3.6.0",
     "latest": "^0.2.0",
     "material-design-icons-iconfont": "^6.1.0",
-    "npm": "^6.14.9",
+    "npm": "^7.8.0",
     "sass-loader": "^10.1.0",
     "vue": "^2.6.11",
     "vue-i18n": "^8.22.2",
@@ -39,4 +39,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}
diff --git a/VpnHood.Client.App.UI.Html/src/assets/styles/custom.css b/VpnHood.Client.App.UI.Html/src/assets/styles/custom.css
@@ -219,6 +219,18 @@ h1, h2, h3 {
     border-radius: 10px;
 }
 
+#speedSection
+{
+    opacity: 0;
+    transition: opacity 1.4s ease;
+}
+
+.state-connected #speedSection 
+{
+    opacity: 1;
+
+}
+
 .speedLabel {
     color: var(--sky-blue);
     margin-right: 5px;

diff --git a/VpnHood.Client.App.UI.Html/src/pages/Home.vue b/VpnHood.Client.App.UI.Html/src/pages/Home.vue
@@ -3,7 +3,7 @@
     id="sectionWrapper"
     fill-height
     fluid
-    class="px-4 pt-4 px-sm-8 pt-sm-5"
+    :class="`px-4 pt-4 px-sm-8 pt-sm-5 state-${connectionState.toLowerCase()}`"
   >
     <v-row class="align-self-start">
       <!-- top bar -->
@@ -30,7 +30,7 @@
     </v-row>
 
     <!-- Speed -->
-    <v-row class="py-0 mt-5" :style="connectionState == 'Connected' ? 'visibility:visible' : 'visibility:hidden'">
+    <v-row id="speedSection" class="py-0 mt-5">
       <v-col cols="6" class="py-0 my-0 text-right">
         <span class="speedLabel">{{$t('downloadSpeed')}}:</span>
         <span class="speedValue">{{this.formatSpeed(this.store.state.receiveSpeed)}}</span>

diff --git a/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip b/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip
diff --git a/VpnHood.Client.App.Win/Resources/SPA.zip b/VpnHood.Client.App.Win/Resources/SPA.zip
diff --git a/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj b/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj
@@ -17,9 +17,9 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <PackageId>VpnHood.Client.App.Win</PackageId>
     <StartupObject></StartupObject>
-    <Version>1.1.235</Version>
-    <AssemblyVersion>1.1.235</AssemblyVersion>
-    <FileVersion>1.1.235</FileVersion>
+    <Version>1.1.236</Version>
+    <AssemblyVersion>1.1.236</AssemblyVersion>
+    <FileVersion>1.1.236</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/VpnHood.Client/VpnHood.Client.csproj b/VpnHood.Client/VpnHood.Client.csproj
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="System.Text.Json" Version="5.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Common/VpnHood.Common.csproj b/VpnHood.Common/VpnHood.Common.csproj
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="System.Text.Json" Version="5.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Server.Access/VpnHood.Server.Access.csproj b/VpnHood.Server.Access/VpnHood.Server.Access.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="System.Text.Json" Version="5.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj b/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj
@@ -14,9 +14,9 @@
     <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
     <PackageIcon>VpnHood.png</PackageIcon>
     <LangVersion>default</LangVersion>
-    <Version>1.1.235</Version>
-    <AssemblyVersion>1.1.235</AssemblyVersion>
-    <FileVersion>1.1.235</FileVersion>
+    <Version>1.1.236</Version>
+    <AssemblyVersion>1.1.236</AssemblyVersion>
+    <FileVersion>1.1.236</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Server/VpnHood.Server.csproj b/VpnHood.Server/VpnHood.Server.csproj
@@ -21,7 +21,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="PacketDotNet" Version="1.2.0" />
-    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="System.Text.Json" Version="5.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Tunneling/VpnHood.Tunneling.csproj b/VpnHood.Tunneling/VpnHood.Tunneling.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="PacketDotNet" Version="1.2.0" />
-    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="System.Text.Json" Version="5.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.ZTest/VpnHood.ZTest.csproj b/VpnHood.ZTest/VpnHood.ZTest.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="EmbedIO" Version="3.4.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
     <PackageReference Include="coverlet.collector" Version="3.0.3">