diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj index 6c816ce9..2d9e6a7b 100644 --- a/Oqtane.Client/Oqtane.Client.csproj +++ b/Oqtane.Client/Oqtane.Client.csproj @@ -35,13 +35,8 @@ - - - - - - + false false diff --git a/Oqtane.Maui/MauiProgram.cs b/Oqtane.Maui/MauiProgram.cs index b1dbb4dd..f2e4b301 100644 --- a/Oqtane.Maui/MauiProgram.cs +++ b/Oqtane.Maui/MauiProgram.cs @@ -11,7 +11,8 @@ namespace Oqtane.Maui; public static class MauiProgram { - static string url = "http://localhost:44357"; // can be overridden in an appsettings.json in AppDataDirectory + // can be overridden in an appsettings.json in AppDataDirectory + static string url = (DeviceInfo.Platform == DevicePlatform.Android) ? "http://10.0.2.2:44357" : "http://localhost:44357"; public static MauiApp CreateMauiApp() { @@ -26,7 +27,7 @@ public static class MauiProgram builder.Services.AddMauiBlazorWebView(); #if DEBUG builder.Services.AddBlazorWebViewDeveloperTools(); -#endif + #endif LoadAppSettings(); @@ -84,7 +85,7 @@ public static class MauiProgram var assemblies = AppDomain.CurrentDomain.GetAssemblies().Select(a => a.GetName().Name).ToList(); // get assemblies from server and load into client app domain - var zip = http.GetByteArrayAsync($"/api/Installation/load").Result; + var zip = http.GetByteArrayAsync("/api/Installation/load").Result; // asemblies and debug symbols are packaged in a zip file using (ZipArchive archive = new ZipArchive(new MemoryStream(zip))) diff --git a/Oqtane.Maui/Oqtane.Maui.csproj b/Oqtane.Maui/Oqtane.Maui.csproj index 681d5b4a..10f4343e 100644 --- a/Oqtane.Maui/Oqtane.Maui.csproj +++ b/Oqtane.Maui/Oqtane.Maui.csproj @@ -60,7 +60,13 @@ + + + + + + @@ -76,4 +82,5 @@ + diff --git a/Oqtane.Maui/Platforms/Android/AndroidManifest.xml b/Oqtane.Maui/Platforms/Android/AndroidManifest.xml index e9937ad7..2617300d 100644 --- a/Oqtane.Maui/Platforms/Android/AndroidManifest.xml +++ b/Oqtane.Maui/Platforms/Android/AndroidManifest.xml @@ -1,6 +1,6 @@ - + - + \ No newline at end of file diff --git a/Oqtane.Maui/Platforms/Android/Resources/xml/network_security_config.xml b/Oqtane.Maui/Platforms/Android/Resources/xml/network_security_config.xml new file mode 100644 index 00000000..c704f54b --- /dev/null +++ b/Oqtane.Maui/Platforms/Android/Resources/xml/network_security_config.xml @@ -0,0 +1,6 @@ + + + + 10.0.2.2 + +