From c7f122f315d94bb6122e972c67bb8925f7308130 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 23 Jun 2020 21:39:03 +0200
Subject: [PATCH] Workaround contact picker issue Android 11

---
 app/src/main/AndroidManifest.xml                         | 5 +++++
 app/src/main/java/eu/faircode/email/FragmentCompose.java | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8a2866bf47..954717186b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,6 +63,11 @@
             <action android:name="android.support.customtabs.action.CustomTabsService" />
         </intent>
 
+        <intent>
+            <action android:name="android.intent.action.PICK" />
+            <data android:scheme="content" />
+        </intent>
+
         <intent>
             <action android:name="android.intent.action.GET_CONTENT" />
             <category android:name="android.intent.category.OPENABLE" />
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 600c730128..fcf596df6a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -440,7 +440,8 @@ public class FragmentCompose extends FragmentBase {
 
                 Intent pick = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Email.CONTENT_URI);
                 PackageManager pm = getContext().getPackageManager();
-                if (pick.resolveActivity(pm) == null) // system whitelisted
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R &&  // should be system whitelisted
+                        pick.resolveActivity(pm) == null)
                     Snackbar.make(view, R.string.title_no_contacts, Snackbar.LENGTH_LONG).show();
                 else
                     startActivityForResult(Helper.getChooser(getContext(), pick), request);