diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e22b8837..308aac4e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v3.0.429 +# Client +* Android: Fix not showing apps in AppFilter + # v3.0.428 ### Server * Fix: Certificate was not updated immediately by Access Manager diff --git a/Pub/PublishToGitHub.ps1 b/Pub/PublishToGitHub.ps1 index ad402322c..c7dfc7bc6 100644 --- a/Pub/PublishToGitHub.ps1 +++ b/Pub/PublishToGitHub.ps1 @@ -8,8 +8,8 @@ $changeLog | Out-File -FilePath "$solutionDir/CHANGELOG.md" -Encoding utf8 -For # create release note $releaseNote = $changeLog; -$releaseNote = $releaseNote -replace "# $versionTag`r`n", ""; # remove version hash -$releaseNote = $releaseNote.SubString(0, $releaseNote.IndexOf("`n# ")); +$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) diff --git a/Pub/Version.json b/Pub/Version.json index a862906dc..4037b3538 100644 --- a/Pub/Version.json +++ b/Pub/Version.json @@ -1,6 +1,6 @@ { - "Version": "3.0.428", - "BumpTime": "2023-09-29T02:36:04.7445112Z", + "Version": "3.0.429", + "BumpTime": "2023-09-29T19:05:30.3412802Z", "Prerelease": false, "DeprecatedVersion": "3.0.400" } diff --git a/VpnHood.Client.App.Android.Xamarin/Properties/AndroidManifest.aab.xml b/VpnHood.Client.App.Android.Xamarin/Properties/AndroidManifest.aab.xml index 1e7e0842d..0b57543e6 100644 --- a/VpnHood.Client.App.Android.Xamarin/Properties/AndroidManifest.aab.xml +++ b/VpnHood.Client.App.Android.Xamarin/Properties/AndroidManifest.aab.xml @@ -1,5 +1,5 @@  - + diff --git a/VpnHood.Client.App.Android.Xamarin/Properties/AndroidManifest.xml b/VpnHood.Client.App.Android.Xamarin/Properties/AndroidManifest.xml index 62ea6e327..ba224c906 100644 --- a/VpnHood.Client.App.Android.Xamarin/Properties/AndroidManifest.xml +++ b/VpnHood.Client.App.Android.Xamarin/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/VpnHood.Client.App.Android.Xamarin/_publish.ps1 b/VpnHood.Client.App.Android.Xamarin/_publish.ps1 index 5a5710eb6..e4bbf7050 100644 --- a/VpnHood.Client.App.Android.Xamarin/_publish.ps1 +++ b/VpnHood.Client.App.Android.Xamarin/_publish.ps1 @@ -13,6 +13,11 @@ PrepareModuleFolder $moduleDir $moduleDirLatest; $module_infoFile = "$moduleDir/VpnHoodClient-android-web.json"; $module_packageFile = "$moduleDir/VpnHoodClient-android-web.apk"; +if ($prerelease) +{ + $module_infoFile = "$moduleDir/VpnHoodClient-android.json"; + $module_packageFile = "$moduleDir/VpnHoodClient-android.apk"; +} # Calcualted Path $module_infoFileName = $(Split-Path "$module_infoFile" -leaf); diff --git a/VpnHood.Client.App.Swagger/Controllers/ApiController.cs b/VpnHood.Client.App.Swagger/Controllers/ApiController.cs index 450ee8067..3626151fc 100644 --- a/VpnHood.Client.App.Swagger/Controllers/ApiController.cs +++ b/VpnHood.Client.App.Swagger/Controllers/ApiController.cs @@ -75,14 +75,14 @@ public Task log() throw new NotImplementedException(); } - [HttpPost(nameof(InstalledApps))] - public Task InstalledApps() + [HttpPost(nameof(installedApps))] + public Task installedApps() { throw new NotImplementedException(); } - [HttpPost(nameof(IpGroups))] - public Task IpGroups() + [HttpPost(nameof(ipGroups))] + public Task ipGroups() { throw new NotImplementedException(); } diff --git a/VpnHood.Client.App.WebServer/Api/IClientApi.cs b/VpnHood.Client.App.WebServer/Api/IClientApi.cs index e8799c1c3..8245da1ff 100644 --- a/VpnHood.Client.App.WebServer/Api/IClientApi.cs +++ b/VpnHood.Client.App.WebServer/Api/IClientApi.cs @@ -18,6 +18,6 @@ public interface IClientApi void addTestServer(); Task setUserSettings(UserSettings userSettings); Task log(); - Task InstalledApps(); - Task IpGroups(); + Task installedApps(); + Task ipGroups(); } \ No newline at end of file diff --git a/VpnHood.Client.App.WebServer/ApiController.cs b/VpnHood.Client.App.WebServer/ApiController.cs index 265dac292..4725321c2 100644 --- a/VpnHood.Client.App.WebServer/ApiController.cs +++ b/VpnHood.Client.App.WebServer/ApiController.cs @@ -106,14 +106,14 @@ public async Task log() await streamWriter.WriteAsync(log); } - [Route(HttpVerbs.Post, "/" + nameof(InstalledApps))] - public Task InstalledApps() + [Route(HttpVerbs.Post, "/" + nameof(installedApps))] + public Task installedApps() { return Task.FromResult(App.Device.InstalledApps); } - [Route(HttpVerbs.Post, "/" + nameof(IpGroups))] - public Task IpGroups() + [Route(HttpVerbs.Post, "/" + nameof(ipGroups))] + public Task ipGroups() { return App.GetIpGroups(); } diff --git a/VpnHood.Client.Device/VpnHood.Client.Device.csproj b/VpnHood.Client.Device/VpnHood.Client.Device.csproj index 4c1eaba21..4e733337b 100644 --- a/VpnHood.Client.Device/VpnHood.Client.Device.csproj +++ b/VpnHood.Client.Device/VpnHood.Client.Device.csproj @@ -11,8 +11,8 @@ https://github.com/vpnhood/vpnhood VpnHood.Client.Device - 3.0.428 - 3.0.428 + 3.0.429 + 3.0.429 $([System.DateTime]::Now.ToString("yyyy.M.d.HHmm")) enable latest diff --git a/VpnHood.Server.App.Net/Pub/Linux/install.sh b/VpnHood.Server.App.Net/Pub/Linux/install.sh index 918ef5f8d..7762f1c8b 100644 --- a/VpnHood.Server.App.Net/Pub/Linux/install.sh +++ b/VpnHood.Server.App.Net/Pub/Linux/install.sh @@ -75,12 +75,20 @@ if [ "$packageFile" = "" ]; then echo "Downloading VpnHoodServer..."; packageFile="VpnHoodServer-linux.tar.gz"; wget -nv -O "$packageFile" "$packageUrl"; + if [ $? != 0 ]; then + echo "Could not download $packageUrl"; + exit 1; + fi fi # extract echo "Extracting to $destinationPath"; mkdir -p $destinationPath; tar -xzf "$packageFile" -C "$destinationPath" +if [ $? != 0 ]; then + echo "Could not extract $packageFile"; + exit 1; +fi # Updating shared files... echo "Updating shared files..."; @@ -116,8 +124,8 @@ After=network.target [Service] Type=simple -ExecStart="$binDir/VpnHoodServer" -ExecStop="$binDir/VpnHoodServer" stop +ExecStart="$destinationPath/vhserver" +ExecStop="$destinationPath/vhserver" stop TimeoutStartSec=0 Restart=always RestartSec=10