From 9cb19c058152a14c0992f98accde23b4a29dccbb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 28 Apr 2021 14:04:27 +0200
Subject: [PATCH] Fix issues on Android 11 (#3067) Add <queries> tag in
 manifest to be able to open file using external app and to use full feature
 of CustomTab

---
 CHANGES.md                          |  1 +
 vector/src/main/AndroidManifest.xml | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b447b6e6e5..1385e0db1a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ Bugfix 🐛:
  - Fix exception in rxSingle (#3180)
  - Do not invite the current user when creating a room (#3123)
  - Fix color issues when the system theme is changed (#2738)
+ - Fix issues on Android 11 (#3067)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 07606d315c..6c6ea46626 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -48,6 +48,22 @@
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
 
+    <!-- Since Android 11, see https://developer.android.com/training/package-visibility -->
+    <queries>
+        <!-- To open URL in CustomTab (prefetch, etc.). It makes CustomTabsClient.getPackageName() work
+         see https://developer.android.com/training/package-visibility/use-cases#open-urls-custom-tabs -->
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
+
+        <!-- The app can open attachments of any mime type
+        see https://developer.android.com/training/package-visibility/use-cases#open-a-file -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="*/*" />
+        </intent>
+    </queries>
+
     <application
         android:name=".VectorApplication"
         android:allowBackup="false"