Skip to content

Commit 3dc65b5

Browse files
authored
Fix 16 kb page-size warning and other android warnings (#2017)
* Fix 16 kb page-size warning * Fix Android build warnings
1 parent 4c03705 commit 3dc65b5

6 files changed

Lines changed: 15 additions & 10 deletions

File tree

backend/Directory.Packages.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@
104104
<PackageVersion Include="SIL.LCModel" Version="11.0.0-beta0138" />
105105
<PackageVersion Include="SIL.LCModel.FixData" Version="11.0.0-beta0138" />
106106
<PackageVersion Include="SIL.WritingSystems" Version="14.2.0-beta0022" />
107+
<!-- Only included so it can be excluded. See FwLiteMaui.csproj. -->
108+
<PackageVersion Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
107109
<PackageVersion Include="Soenneker.Utils.AutoBogus" Version="3.0.410" />
108110
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.11" />
109111
<PackageVersion Include="SQLitePCLRaw.core" Version="2.1.11" />

backend/FwLite/FwDataMiniLcmBridge/Api/RichTextMapping.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using System.Collections.Frozen;
22
using System.Drawing;
33
using System.Globalization;
4-
using System.Text;
54
using MiniLcm.Models;
65
using MiniLcm.RichText;
7-
using Mono.Unix.Native;
86
using SIL.LCModel.Core.KernelInterfaces;
97
using SIL.LCModel.Core.Text;
108
using SIL.LCModel.Utils;

backend/FwLite/FwLiteMaui/FwLiteMaui.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,13 @@
8585
<ProjectReference Include="..\FwDataMiniLcmBridge\FwDataMiniLcmBridge.csproj" />
8686
<ProjectReference Include="..\FwLiteProjectSync\FwLiteProjectSync.csproj" />
8787
</ItemGroup>
88+
<ItemGroup>
89+
<!--
90+
Only included so it can be excluded (from MiniLcm->SIL.WritingSystems)
91+
as it "does not have a 16 KB page size" (https://devblogs.microsoft.com/dotnet/maui-google-play-16-kb-page-size-support).
92+
It appears to have very minimal usage in SIL.LCMModel (setting execution bits and such), so excluding it is likely both safe and desirable.
93+
Excluding it in MiniLcm.csproj did not silence the build warnings.
94+
-->
95+
<PackageReference Include="Mono.Unix" ExcludeAssets="all" />
96+
</ItemGroup>
8897
</Project>

backend/FwLite/FwLiteMaui/MainPage.xaml.Android.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ private partial void BlazorWebViewInitialized(object? sender, BlazorWebViewIniti
3232
e.WebView.Settings.AllowFileAccess = true;
3333
e.WebView.Settings.MediaPlaybackRequiresUserGesture = false;
3434
e.WebView.Settings.SetGeolocationEnabled(true);
35-
e.WebView.Settings.SetGeolocationDatabasePath(e.WebView.Context?.FilesDir?.Path);
36-
e.WebView.SetWebChromeClient(new PermissionManagingBlazorWebChromeClient(e.WebView.WebChromeClient!, activity));
35+
var baseClient = OperatingSystem.IsAndroidVersionAtLeast(26)
36+
? (e.WebView.WebChromeClient ?? new Android.Webkit.WebChromeClient())
37+
: new Android.Webkit.WebChromeClient();
38+
e.WebView.SetWebChromeClient(new PermissionManagingBlazorWebChromeClient(baseClient, activity));
3739
}
3840

3941
private partial void BlazorWebViewOnUrlLoading(object? sender, UrlLoadingEventArgs e)

backend/Testing/Services/JwtHelper.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
using System.Text.Json;
66
using LexBoxApi.Auth;
77
using LexCore.Auth;
8-
using Microsoft.Extensions.Http.Resilience;
9-
using Mono.Unix.Native;
10-
using Polly;
11-
using FluentAssertions;
128
using Testing.ApiTests;
139

1410
namespace Testing.Services;

backend/Testing/Services/ModifyProjectHelper.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using Mono.Unix.Native;
2-
31
namespace Testing.Services;
42

53
public class ModifyProjectHelper

0 commit comments

Comments
 (0)