Merge pull request #238 from humhub/f-iinternal-update-info-plist-and…

…-merge-web-view-settings

Update info.plist and settings

ios/Runner/Info.plist

@@ -58,6 +58,8 @@
 	<false/>
 	<key>NSCameraUsageDescription</key>
     <string>We need access to your camera to take photos and videos for sharing in the app.</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>We need access to your microphone to take videos for sharing in the app.</string>
     <key>NSPhotoLibraryUsageDescription</key>
     <string>We need access your photo library to allow you to upload, view, and manage photos within the app.</string>
     <key>NSAppTransportSecurity</key>

lib/flavored/web_view.f.dart

@@ -79,7 +79,7 @@ class FlavoredWebViewState extends ConsumerState<WebViewF> {
           bottom: false,
           child: InAppWebView(
             initialUrlRequest: _initialRequest,
-            initialSettings: _settings,
+            initialSettings: WebViewGlobalController.settings,
             pullToRefreshController: pullToRefreshController,
             shouldOverrideUrlLoading: _shouldOverrideUrlLoading,
             shouldInterceptFetchRequest: _shouldInterceptFetchRequest,
@@ -90,10 +90,6 @@ class FlavoredWebViewState extends ConsumerState<WebViewF> {
             onReceivedError: _onLoadError,
             onProgressChanged: _onProgressChanged,
             onDownloadStartRequest: _onDownloadStartRequest,
-            onPermissionRequest: (controller, permissionRequest) {
-              logInfo('onPermissionRequest', [controller, permissionRequest]);
-              return Future.value(PermissionResponse(action: PermissionResponseAction.DENY));
-            },
           ),
         ),
       ),
@@ -111,17 +107,6 @@ class FlavoredWebViewState extends ConsumerState<WebViewF> {
     return URLRequest(url: WebUri(url), headers: instance.customHeaders);
   }
 
-  InAppWebViewSettings get _settings => InAppWebViewSettings(
-        useShouldOverrideUrlLoading: true,
-        useShouldInterceptFetchRequest: true,
-        javaScriptEnabled: true,
-        supportZoom: false,
-        javaScriptCanOpenWindowsAutomatically: true,
-        supportMultipleWindows: true,
-        useHybridComposition: true,
-        allowsInlineMediaPlayback: true,
-      );
-
   Future<NavigationActionPolicy?> _shouldOverrideUrlLoading(
       InAppWebViewController controller, NavigationAction action) async {
     // 1st check if url is not def. app url and open it in a browser or inApp.

lib/pages/web_view.dart

@@ -47,16 +47,6 @@ class WebViewAppState extends ConsumerState<WebView> {
   bool _isInit = false;
   late double downloadProgress = 0;
 
-  final _settings = InAppWebViewSettings(
-    useShouldOverrideUrlLoading: true,
-    useShouldInterceptFetchRequest: true,
-    javaScriptEnabled: true,
-    supportZoom: false,
-    javaScriptCanOpenWindowsAutomatically: true,
-    supportMultipleWindows: true,
-    useHybridComposition: true,
-  );
-
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -99,7 +89,7 @@ class WebViewAppState extends ConsumerState<WebView> {
             onWillPop: () => exitApp(context, ref),
             child: InAppWebView(
               initialUrlRequest: _initialRequest,
-              initialSettings: _settings,
+              initialSettings: WebViewGlobalController.settings,
               pullToRefreshController: _pullToRefreshController,
               shouldOverrideUrlLoading: _shouldOverrideUrlLoading,
               onWebViewCreated: _onWebViewCreated,
@@ -143,8 +133,10 @@ class WebViewAppState extends ConsumerState<WebView> {
   Future<NavigationActionPolicy?> _shouldOverrideUrlLoading(
       InAppWebViewController controller, NavigationAction action) async {
     WebViewGlobalController.ajaxSetHeaders(headers: ref.read(humHubProvider).customHeaders);
+    WebViewGlobalController.injectWebSupportScript();
 
     final url = action.request.url!.rawValue;
+
     /// First BLOCK everything that rules out as blocked.
     if (BlackListRules.check(url)) {
       return NavigationActionPolicy.CANCEL;
@@ -226,11 +218,13 @@ class WebViewAppState extends ConsumerState<WebView> {
               "document.querySelector('#account-login-form > div.form-group.field-login-rememberme').style.display='none';");
     }
     WebViewGlobalController.ajaxSetHeaders(headers: ref.read(humHubProvider).customHeaders);
+    WebViewGlobalController.injectWebSupportScript();
     LoadingProvider.of(ref).dismissAll();
   }
 
   void _onLoadStart(InAppWebViewController controller, Uri? url) async {
     WebViewGlobalController.ajaxSetHeaders(headers: ref.read(humHubProvider).customHeaders);
+    WebViewGlobalController.injectWebSupportScript();
   }
 
   _onProgressChanged(InAppWebViewController controller, int progress) {

lib/util/web_view_global_controller.dart

@@ -49,4 +49,28 @@ class WebViewGlobalController {
     String jsCode = "\$.ajaxSetup({headers: ${jsonEncode(headers).toString()}});";
     value?.evaluateJavascript(source: jsCode);
   }
+
+  static void injectWebSupportScript() {
+    String script = """
+      var head = document.head || document.getElementsByTagName('head')[0];
+      var scriptElement = document.createElement('script');
+      scriptElement.type = 'application/javascript';
+      scriptElement.src = '/assets/packages/flutter_inappwebview/assets/web/web_support.js';
+      scriptElement.defer = true;
+      head.appendChild(scriptElement);
+    """;
+
+    value?.evaluateJavascript(source: script);
+  }
+
+  static InAppWebViewSettings get settings => InAppWebViewSettings(
+      useShouldOverrideUrlLoading: true,
+      useShouldInterceptFetchRequest: true,
+      javaScriptEnabled: true,
+      supportZoom: false,
+      javaScriptCanOpenWindowsAutomatically: true,
+      supportMultipleWindows: true,
+      useHybridComposition: true,
+      allowsInlineMediaPlayback: true,
+      mediaPlaybackRequiresUserGesture: false);
 }