diff --git a/backend/Directory.Packages.props b/backend/Directory.Packages.props
index 1c547f45f4..d1091b5609 100644
--- a/backend/Directory.Packages.props
+++ b/backend/Directory.Packages.props
@@ -104,6 +104,8 @@
+
+
@@ -135,4 +137,4 @@
-
\ No newline at end of file
+
diff --git a/backend/FwLite/FwDataMiniLcmBridge/Api/RichTextMapping.cs b/backend/FwLite/FwDataMiniLcmBridge/Api/RichTextMapping.cs
index ddd39675b0..2c722d11be 100644
--- a/backend/FwLite/FwDataMiniLcmBridge/Api/RichTextMapping.cs
+++ b/backend/FwLite/FwDataMiniLcmBridge/Api/RichTextMapping.cs
@@ -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;
diff --git a/backend/FwLite/FwLiteMaui/FwLiteMaui.csproj b/backend/FwLite/FwLiteMaui/FwLiteMaui.csproj
index bb2d7beeb9..a75b7640b9 100644
--- a/backend/FwLite/FwLiteMaui/FwLiteMaui.csproj
+++ b/backend/FwLite/FwLiteMaui/FwLiteMaui.csproj
@@ -85,4 +85,13 @@
+
+
+
+
diff --git a/backend/FwLite/FwLiteMaui/MainPage.xaml.Android.cs b/backend/FwLite/FwLiteMaui/MainPage.xaml.Android.cs
index 40c735b0f4..21879541d9 100644
--- a/backend/FwLite/FwLiteMaui/MainPage.xaml.Android.cs
+++ b/backend/FwLite/FwLiteMaui/MainPage.xaml.Android.cs
@@ -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)
diff --git a/backend/Testing/Services/JwtHelper.cs b/backend/Testing/Services/JwtHelper.cs
index 5c792182f4..6317bcbdce 100644
--- a/backend/Testing/Services/JwtHelper.cs
+++ b/backend/Testing/Services/JwtHelper.cs
@@ -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;
diff --git a/backend/Testing/Services/ModifyProjectHelper.cs b/backend/Testing/Services/ModifyProjectHelper.cs
index 52d7d8f070..07e0392ce8 100644
--- a/backend/Testing/Services/ModifyProjectHelper.cs
+++ b/backend/Testing/Services/ModifyProjectHelper.cs
@@ -1,5 +1,3 @@
-using Mono.Unix.Native;
-
namespace Testing.Services;
public class ModifyProjectHelper