Add READ_EXTERNAL_STORAGE permission

1 files changed, 29 insertions, 19 deletions

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 52d85bb90..79b8dbb27 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -53,19 +53,32 @@
         android:name="${applicationId}.WRITE_TEMPORARY_STORAGE"
         android:protectionLevel="signature" />
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.NFC" />
+    <!-- CAMERA permission requested by ZXing library -->
+
+    <!-- contact group -->
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
     <uses-permission android:name="android.permission.WRITE_PROFILE" />
 
+    <!-- storage group -->
+    <!--
+        No need on >= Android 4.4 for WRITE_EXTERNAL_STORAGE, because we use Storage Access Framework,
+        but better not use maxSdkVersion as it causes problems: https://code.google.com/p/android/issues/detail?id=63895
+    -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!-- READ_EXTERNAL_STORAGE is now dangerous on Android >= 6 -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <!-- other group (for free) -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+
     <!-- android:allowBackup="false": Don't allow backup over adb backup or other apps! -->
     <application
         android:name=".KeychainApplication"
@@ -97,12 +110,12 @@
                 android:value=".ui.MainActivity" />
             <!-- Connect with YubiKeys. This Activity will automatically show/import/create YubiKeys -->
             <intent-filter android:label="@string/app_name">
-                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+                <category android:name="android.intent.category.DEFAULT" />
                 <data
-                    android:scheme="https"
                     android:host="my.yubico.com"
-                    android:pathPrefix="/neo"/>
+                    android:pathPrefix="/neo"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
         <activity
@@ -114,9 +127,7 @@
             android:name=".ui.linked.LinkedIdWizard"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_linked_create"
-            android:parentActivityName=".ui.ViewKeyActivity"
-            >
-        </activity>
+            android:parentActivityName=".ui.ViewKeyActivity"></activity>
         <activity
             android:name=".ui.QrCodeViewActivity"
             android:label="@string/share_qr_code_dialog_title" />
@@ -211,8 +222,8 @@
                 <data android:mimeType="message/*" />
             </intent-filter>
             <!-- Android 6 Floating Action Mode -->
-            <intent-filter >
-                <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <intent-filter>
+                <action android:name="android.intent.action.PROCESS_TEXT" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="text/plain" />
             </intent-filter>
@@ -505,8 +516,7 @@
                 <data android:mimeType="application/pgp-keys" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.QrCodeCaptureActivity"/>
+        <activity android:name=".ui.QrCodeCaptureActivity" />
         <activity
             android:name=".ui.ImportKeysActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@@ -720,10 +730,10 @@
          -->
         <activity
             android:name=".ui.NfcOperationActivity"
-            android:theme="@style/Theme.Keychain.Light.Dialog"
             android:allowTaskReparenting="true"
             android:launchMode="singleTop"
-            android:taskAffinity=":Nfc" />
+            android:taskAffinity=":Nfc"
+            android:theme="@style/Theme.Keychain.Light.Dialog" />
 
         <activity
             android:name=".ui.HelpActivity"
@@ -748,7 +758,7 @@
             android:name=".provider.KeychainProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
-            android:label="@string/keyserver_sync_settings_title"/>
+            android:label="@string/keyserver_sync_settings_title" />
 
         <!-- Internal classes of the remote APIs (not exported) -->
         <activity