diff options
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 7af9d895f..c10629c6d 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -49,6 +49,10 @@ android:name="android.hardware.touchscreen" android:required="false" /> + <permission android:name="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" /> + + <uses-permission android:name="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" /> + <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.NFC" /> @@ -152,12 +156,14 @@ <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT" /> <category android:name="android.intent.category.DEFAULT" /> - <!-- TODO: accept other schemes! --> + <data android:scheme="file" /> + <data android:scheme="content" /> </intent-filter> <!-- Android's Send Action --> <intent-filter android:label="@string/intent_send_encrypt"> <action android:name="android.intent.action.SEND" /> + <action android:name="android.intent.action.SEND_MULTIPLE" /> <category android:name="android.intent.category.DEFAULT" /> @@ -170,26 +176,16 @@ android:label="@string/title_decrypt" android:windowSoftInputMode="stateHidden"> - <!--<!– VIEW with mimeType: TODO (from email app) –>--> - <!--<intent-filter android:label="@string/intent_import_key">--> - <!--<action android:name="android.intent.action.VIEW" />--> - - <!--<category android:name="android.intent.category.BROWSABLE" />--> - <!--<category android:name="android.intent.category.DEFAULT" />--> - - <!--<!– mime type as defined in http://tools.ietf.org/html/rfc3156 –>--> - <!--<data android:mimeType="application/pgp-signature" />--> - <!--</intent-filter>--> - <!--<!– VIEW with mimeType: TODO (from email app) –>--> - <!--<intent-filter android:label="@string/intent_import_key">--> - <!--<action android:name="android.intent.action.VIEW" />--> + <!-- VIEW with mimeType application/pgp-encrypted --> + <intent-filter android:label="@string/intent_send_decrypt"> + <action android:name="android.intent.action.VIEW" /> - <!--<category android:name="android.intent.category.BROWSABLE" />--> - <!--<category android:name="android.intent.category.DEFAULT" />--> + <category android:name="android.intent.category.BROWSABLE" /> + <category android:name="android.intent.category.DEFAULT" /> - <!--<!– mime type as defined in http://tools.ietf.org/html/rfc3156 –>--> - <!--<data android:mimeType="application/pgp-encrypted" />--> - <!--</intent-filter>--> + <!-- mime type as defined in http://tools.ietf.org/html/rfc3156 --> + <data android:mimeType="application/pgp-encrypted" /> + </intent-filter> <!-- Keychain's own Actions --> <!-- DECRYPT with text as extra --> <intent-filter> @@ -202,8 +198,9 @@ <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" /> <category android:name="android.intent.category.DEFAULT" /> - <!-- TODO: accept other schemes! --> + <data android:scheme="file" /> + <data android:scheme="content" /> </intent-filter> <!-- Android's Send Action --> <intent-filter android:label="@string/intent_send_decrypt"> @@ -644,6 +641,12 @@ android:resource="@xml/custom_pgp_contacts_structure" /> </service> + <provider + android:name=".provider.TemporaryStorageProvider" + android:authorities="org.sufficientlysecure.keychain.tempstorage" + android:writePermission="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" + android:exported="true" /> + </application> </manifest> |