From f6e03ff04057004a57eb993df5c14ba7a7a26428 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 17 Feb 2022 20:56:31 +0100
Subject: [PATCH] Don't expose MessageProvider to third-party apps

If this was an important feature to you, please contact us and tell us a little bit about your use case.
---
 app/k9mail/src/main/AndroidManifest.xml       | 23 +------------------
 app/ui/legacy/src/main/res/values/strings.xml |  5 ----
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/app/k9mail/src/main/AndroidManifest.xml b/app/k9mail/src/main/AndroidManifest.xml
index 18c6899cf..8b3dbb4ac 100644
--- a/app/k9mail/src/main/AndroidManifest.xml
+++ b/app/k9mail/src/main/AndroidManifest.xml
@@ -25,23 +25,6 @@
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
-    <permission
-        android:name="${applicationId}.permission.READ_MESSAGES"
-        android:description="@string/read_messages_desc"
-        android:label="@string/read_messages_label"
-        android:permissionGroup="android.permission-group.MESSAGES"
-        android:protectionLevel="dangerous"/>
-    <uses-permission android:name="${applicationId}.permission.READ_MESSAGES"/>
-
-    <permission
-        android:name="${applicationId}.permission.DELETE_MESSAGES"
-        android:description="@string/delete_messages_desc"
-        android:label="@string/delete_messages_label"
-        android:permissionGroup="android.permission-group.MESSAGES"
-        android:protectionLevel="dangerous"/>
-    <uses-permission android:name="${applicationId}.permission.DELETE_MESSAGES"/>
-
-
     <application
         android:name="com.fsck.k9.App"
         android:allowTaskReparenting="false"
@@ -411,11 +394,7 @@
         <provider
             android:name=".external.MessageProvider"
             android:authorities="${applicationId}.messageprovider"
-            android:exported="true"
-            android:grantUriPermissions="true"
-            android:multiprocess="true"
-            android:readPermission="${applicationId}.permission.READ_MESSAGES"
-            android:writePermission="${applicationId}.permission.DELETE_MESSAGES"/>
+            android:exported="false" />
 
         <provider
             android:name=".provider.EmailProvider"
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index b2d8e2bc9..5d84a3d6d 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -77,11 +77,6 @@ Please submit bug reports, contribute new features and ask questions at
 
     <string name="authors">Authors</string>
 
-    <string name="read_messages_label">Read Emails</string>
-    <string name="read_messages_desc">Allows this application to read your Emails.</string>
-    <string name="delete_messages_label">Delete Emails</string>
-    <string name="delete_messages_desc">Allows this application to delete your Emails.</string>
-
     <string name="about_title">About K-9 Mail</string>
     <string name="accounts_title">Accounts</string>
     <string name="advanced">Advanced</string>