Merge branch 'development'

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

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)

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"
 }

VpnHood.Client.App.Android.Xamarin/Properties/AndroidManifest.aab.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="427" package="com.vpnhood.client.android" android:installLocation="preferExternal" android:versionName="3.0.427">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="429" package="com.vpnhood.client.android" android:installLocation="preferExternal" android:versionName="3.0.429">
   <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="33" />
   <application android:label="@string/app_name" android:icon="@mipmap/appicon" android:allowBackup="true" android:usesCleartextTraffic="true" android:supportsRtl="true">
   </application>

VpnHood.Client.App.Android.Xamarin/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="427" package="com.vpnhood.client.android.web" android:installLocation="preferExternal" android:versionName="3.0.427">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="429" package="com.vpnhood.client.android.web" android:installLocation="preferExternal" android:versionName="3.0.429">
   <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="33" />
   <application android:label="@string/app_name" android:icon="@mipmap/appicon" android:allowBackup="true" android:usesCleartextTraffic="true" android:supportsRtl="true">
   </application>

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);

VpnHood.Client.App.Swagger/Controllers/ApiController.cs

@@ -75,14 +75,14 @@ public Task log()
             throw new NotImplementedException();
         }
 
-        [HttpPost(nameof(InstalledApps))]
-        public Task<DeviceAppInfo[]> InstalledApps()
+        [HttpPost(nameof(installedApps))]
+        public Task<DeviceAppInfo[]> installedApps()
         {
             throw new NotImplementedException();
         }
 
-        [HttpPost(nameof(IpGroups))]
-        public Task<IpGroup[]> IpGroups()
+        [HttpPost(nameof(ipGroups))]
+        public Task<IpGroup[]> ipGroups()
         {
             throw new NotImplementedException();
         }

VpnHood.Client.App.WebServer/Api/IClientApi.cs

@@ -18,6 +18,6 @@ public interface IClientApi
     void addTestServer();
     Task setUserSettings(UserSettings userSettings);
     Task log();
-    Task<DeviceAppInfo[]> InstalledApps();
-    Task<IpGroup[]> IpGroups();
+    Task<DeviceAppInfo[]> installedApps();
+    Task<IpGroup[]> ipGroups();
 }

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<DeviceAppInfo[]> InstalledApps()
+    [Route(HttpVerbs.Post, "/" + nameof(installedApps))]
+    public Task<DeviceAppInfo[]> installedApps()
     {
         return Task.FromResult(App.Device.InstalledApps);
     }
 
-    [Route(HttpVerbs.Post, "/" + nameof(IpGroups))]
-    public Task<IpGroup[]> IpGroups()
+    [Route(HttpVerbs.Post, "/" + nameof(ipGroups))]
+    public Task<IpGroup[]> ipGroups()
     {
         return App.GetIpGroups();
     }

VpnHood.Client.Device/VpnHood.Client.Device.csproj

@@ -11,8 +11,8 @@
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
 		<RepositoryType></RepositoryType>
 		<RootNamespace>VpnHood.Client.Device</RootNamespace>
-		<Version>3.0.428</Version>
-		<AssemblyVersion>3.0.428</AssemblyVersion>
+		<Version>3.0.429</Version>
+		<AssemblyVersion>3.0.429</AssemblyVersion>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<Nullable>enable</Nullable>
 		<LangVersion>latest</LangVersion>

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