Merge pull request #16468 from nextcloud/jtr/fix-camera2-manifest-build-overrides

fix(manifest): Move camera2 feature declaration to scan-enabled flavors

Author: alperozturk96

app/src/gplay/AndroidManifest.xml

@@ -15,6 +15,12 @@
 
     <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
 
+    <!-- Used for document scanning, but lib declares it as required, which it's not -->
+    <uses-feature
+        android:name="android.hardware.camera2"
+        android:required="false"
+        tools:node="replace" />
+
     <application
         android:name=".MainApp"
         android:icon="@mipmap/ic_launcher"

app/src/huawei/AndroidManifest.xml

@@ -9,6 +9,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- Used for document scanning, but lib declares it as required, which it's not -->
+    <uses-feature
+        android:name="android.hardware.camera2"
+        android:required="false"
+        tools:node="replace" />
+
     <application
         android:name=".MainApp"
         android:fullBackupContent="@xml/backup_config"

app/src/main/AndroidManifest.xml

@@ -11,13 +11,9 @@
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.READ_CALENDAR" />
-    <uses-permission android:name="android.permission.WRITE_CALENDAR" /> <!-- Used for document scanning, but lib declares it as required, which it's not -->
-    <uses-feature
-        android:name="android.hardware.camera2"
-        android:required="false"
-        tools:node="replace" />
-    <!--
- WRITE_EXTERNAL_STORAGE may be enabled or disabled by the user after installation in
+    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
+    <!-- 
+        WRITE_EXTERNAL_STORAGE may be enabled or disabled by the user after installation in
         API >= 23; the app needs to handle this
     -->
     <uses-permission

app/src/qa/AndroidManifest.xml

@@ -8,6 +8,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- Used for document scanning, but lib declares it as required, which it's not -->
+    <uses-feature
+        android:name="android.hardware.camera2"
+        android:required="false"
+        tools:node="replace" />
+
     <application
         android:allowBackup="false"
         tools:replace="android:allowBackup" />