From c75f3774ad13cd241b0e3836262cead2562b5331 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 7 Jul 2021 13:13:02 +0200
Subject: [PATCH] MOBILE-3320 camera: Fix for Android 11

---
 config.xml                                    | 12 +++++++++++-
 src/core/features/emulator/services/camera.ts |  4 ++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/config.xml b/config.xml
index bc9004833..5edb28abf 100644
--- a/config.xml
+++ b/config.xml
@@ -224,6 +224,16 @@
         <config-file parent="/*" target="AndroidManifest.xml">
             <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
         </config-file>
+        <config-file parent="/*" target="AndroidManifest.xml">
+            <queries>
+                <intent>
+                    <action android:name="android.media.action.IMAGE_CAPTURE" />
+                </intent>
+                <intent>
+                    <action android:name="android.intent.action.GET_CONTENT" />
+                </intent>
+            </queries>
+        </config-file>
     </platform>
     <platform name="ios">
         <resource-file src="GoogleService-Info.plist" />
@@ -248,7 +258,7 @@
         <edit-config file="*-Info.plist" mode="merge" target="CFBundleShortVersionString">
             <string>3.9.5</string>
         </edit-config>
-        <edit-config target="CFBundleLocalizations" file="*-Info.plist" mode="overwrite">
+        <edit-config file="*-Info.plist" mode="overwrite" target="CFBundleLocalizations">
             <array>
                 <string>en</string>
             </array>
diff --git a/src/core/features/emulator/services/camera.ts b/src/core/features/emulator/services/camera.ts
index 1aa4114e2..319e09eba 100644
--- a/src/core/features/emulator/services/camera.ts
+++ b/src/core/features/emulator/services/camera.ts
@@ -17,6 +17,10 @@ import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
 
 import { CoreEmulatorCaptureHelper } from './capture-helper';
 
+// @todo remove android.media.action.IMAGE_CAPTURE and android.intent.action.GET_CONTENT entries
+// from config.xml once https://github.com/apache/cordova-plugin-camera/issues/673 is resolved.
+// (this is written here because comments get stripped out from config.xml)
+
 /**
  * Emulates the Cordova Camera plugin in browser.
  */