Merge pull request #265 from humhub/f-fix-only-office-connector-on-ios

Fix onlyoffice connector
humhub · Jan 9, 2025 · 34bf5ab · 34bf5ab
2 parents 0e0eb52 + bcdc054
commit 34bf5ab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/flavored/web_view.f.dart b/lib/flavored/web_view.f.dart
@@ -159,7 +159,7 @@ class FlavoredWebViewState extends ConsumerState<WebViewF> {
   }
 
   Future<FetchRequest?> _shouldInterceptFetchRequest(InAppWebViewController controller, FetchRequest request) async {
-    request.headers!.addAll(_initialRequest.headers!);
+    request.headers?.addAll(instance.customHeaders);
     return request;
   }
 

diff --git a/lib/pages/web_view.dart b/lib/pages/web_view.dart
@@ -197,7 +197,7 @@ class WebViewAppState extends ConsumerState<WebView> {
   Future<FetchRequest?> _shouldInterceptFetchRequest(
       InAppWebViewController controller, FetchRequest request) async {
     logDebug("_shouldInterceptFetchRequest");
-    request.headers!.addAll(_initialRequest.headers!);
+    request.headers?.addAll(_initialRequest.headers!);
     return request;
   }
 

diff --git a/lib/util/web_view_global_controller.dart b/lib/util/web_view_global_controller.dart
@@ -141,7 +141,7 @@ class WebViewGlobalController {
   static InAppWebViewSettings settings({bool zoom = false}) {
     return InAppWebViewSettings(
       useShouldOverrideUrlLoading: true,
-      useShouldInterceptFetchRequest: true,
+      useShouldInterceptFetchRequest: false,
       javaScriptEnabled: true,
       javaScriptCanOpenWindowsAutomatically: true,
       supportMultipleWindows: true,