Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion backend/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@
<PackageVersion Include="SIL.LCModel" Version="11.0.0-beta0122" />
<PackageVersion Include="SIL.LCModel.FixData" Version="11.0.0-beta0122" />
<PackageVersion Include="SIL.WritingSystems" Version="14.2.0-beta0022" />
<!-- Only included so it can be excluded. See FwLiteMaui.csproj. -->
<PackageVersion Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
<PackageVersion Include="Soenneker.Utils.AutoBogus" Version="3.0.410" />
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.11" />
<PackageVersion Include="SQLitePCLRaw.core" Version="2.1.11" />
Expand Down Expand Up @@ -135,4 +137,4 @@
<ItemGroup>
<GlobalPackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20" />
</ItemGroup>
</Project>
</Project>
2 changes: 0 additions & 2 deletions backend/FwLite/FwDataMiniLcmBridge/Api/RichTextMapping.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
using System.Collections.Frozen;
using System.Drawing;
using System.Globalization;
using System.Text;
using MiniLcm.Models;
using MiniLcm.RichText;
using Mono.Unix.Native;
using SIL.LCModel.Core.KernelInterfaces;
using SIL.LCModel.Core.Text;
using SIL.LCModel.Utils;
Expand Down
9 changes: 9 additions & 0 deletions backend/FwLite/FwLiteMaui/FwLiteMaui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,13 @@
<ProjectReference Include="..\FwDataMiniLcmBridge\FwDataMiniLcmBridge.csproj" />
<ProjectReference Include="..\FwLiteProjectSync\FwLiteProjectSync.csproj" />
</ItemGroup>
<ItemGroup>
<!--
Only included so it can be excluded (from MiniLcm->SIL.WritingSystems)
as it "does not have a 16 KB page size" (https://devblogs.microsoft.com/dotnet/maui-google-play-16-kb-page-size-support).
It appears to have very minimal usage in SIL.LCMModel (setting execution bits and such), so excluding it is likely both safe and desirable.
Excluding it in MiniLcm.csproj did not silence the build warnings.
-->
<PackageReference Include="Mono.Unix" ExcludeAssets="all" />
</ItemGroup>
</Project>
6 changes: 4 additions & 2 deletions backend/FwLite/FwLiteMaui/MainPage.xaml.Android.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ private partial void BlazorWebViewInitialized(object? sender, BlazorWebViewIniti
e.WebView.Settings.AllowFileAccess = true;
e.WebView.Settings.MediaPlaybackRequiresUserGesture = false;
e.WebView.Settings.SetGeolocationEnabled(true);
e.WebView.Settings.SetGeolocationDatabasePath(e.WebView.Context?.FilesDir?.Path);
e.WebView.SetWebChromeClient(new PermissionManagingBlazorWebChromeClient(e.WebView.WebChromeClient!, activity));
var baseClient = OperatingSystem.IsAndroidVersionAtLeast(26)
? (e.WebView.WebChromeClient ?? new Android.Webkit.WebChromeClient())
: new Android.Webkit.WebChromeClient();
e.WebView.SetWebChromeClient(new PermissionManagingBlazorWebChromeClient(baseClient, activity));
}

private partial void BlazorWebViewOnUrlLoading(object? sender, UrlLoadingEventArgs e)
Expand Down
4 changes: 0 additions & 4 deletions backend/Testing/Services/JwtHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
using System.Text.Json;
using LexBoxApi.Auth;
using LexCore.Auth;
using Microsoft.Extensions.Http.Resilience;
using Mono.Unix.Native;
using Polly;
using FluentAssertions;
using Testing.ApiTests;

namespace Testing.Services;
Expand Down
2 changes: 0 additions & 2 deletions backend/Testing/Services/ModifyProjectHelper.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using Mono.Unix.Native;

namespace Testing.Services;

public class ModifyProjectHelper
Expand Down
Loading