diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-05 09:26:57 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-05 09:26:57 +0200 |
| commit | e3f5c6d01e160dc638f15e912f4499065d17206f (patch) | |
| tree | 13fdc19e71948c24dc89d65eb4647802420b3abd /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 855b8c4ef9889b53db9b5e54f3816fa8861976f6 (diff) | |
| download | open-keychain-e3f5c6d01e160dc638f15e912f4499065d17206f.tar.gz open-keychain-e3f5c6d01e160dc638f15e912f4499065d17206f.tar.bz2 open-keychain-e3f5c6d01e160dc638f15e912f4499065d17206f.zip | |
Cleanup manifest
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 6bc61460a..6c3aabeef 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ Association of file types to Keychain ===================================== General remarks about file ending conventions: - - *.gpg for binary files + - *.gpg,*.pgp for binary files - *.asc for ascii armored files The actual content can be anything. The file ending only shows if it is binary or ascii encoded. @@ -148,8 +148,7 @@ android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> - <!-- Keychain's own Actions --> - <!-- ENCRYPT with data Uri --> + <!-- ENCRYPT_DATA with data Uri --> <intent-filter> <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_DATA" /> @@ -181,8 +180,7 @@ android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> - <!-- Keychain's own Actions --> - <!-- ENCRYPT with text as extra --> + <!-- ENCRYPT_TEXT with text as extra --> <intent-filter> <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_TEXT" /> @@ -208,8 +206,7 @@ android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> - <!-- Keychain's own Actions --> - <!-- DECRYPT with text as extra --> + <!-- DECRYPT_TEXT with text as extra --> <intent-filter> <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_TEXT" /> @@ -235,7 +232,7 @@ android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> - <!-- VIEW with mimeType application/octet-stream, application/pgp and text/pgp --> + <!-- VIEW with mimeTypes --> <intent-filter android:label="@string/intent_send_decrypt"> <action android:name="android.intent.action.VIEW" /> @@ -255,9 +252,14 @@ <!-- non-standard MIME types found in the wild --> <data android:mimeType="application/pgp" /> <data android:mimeType="text/pgp" /> + + <!-- + This links to attached asc files in AOSP mail. It is deactivated because of + https://github.com/open-keychain/open-keychain/issues/290 + --> + <!--<data android:mimeType="text/plain" />--> </intent-filter> - <!-- Keychain's own Actions --> - <!-- DECRYPT with data Uri --> + <!-- DECRYPT_DATA with data Uri --> <intent-filter> <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_DATA" /> @@ -290,7 +292,7 @@ <data android:scheme="file" /> <data android:scheme="content" /> - <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data --> + <!-- ASCII data, mostly keys, but sometimes signatures and encrypted data --> <data android:pathPattern=".*\\.asc" /> <data android:pathPattern=".*\\..*\\.asc" /> <data android:pathPattern=".*\\..*\\..*\\.asc" /> @@ -352,7 +354,7 @@ <data android:mimeType="*/*" /> - <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data --> + <!-- ASCII data, mostly keys, but sometimes signatures and encrypted data --> <data android:pathPattern=".*\\.asc" /> <data android:pathPattern=".*\\..*\\.asc" /> <data android:pathPattern=".*\\..*\\..*\\.asc" /> @@ -516,7 +518,7 @@ <data android:scheme="file" /> <data android:scheme="content" /> - <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data --> + <!-- ASCII data, mostly keys, but sometimes signatures and encrypted data --> <data android:pathPattern=".*\\.asc" /> <data android:pathPattern=".*\\..*\\.asc" /> <data android:pathPattern=".*\\..*\\..*\\.asc" /> @@ -578,7 +580,7 @@ <data android:mimeType="*/*" /> - <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data --> + <!-- ASCII data, mostly keys, but sometimes signatures and encrypted data --> <data android:pathPattern=".*\\.asc" /> <data android:pathPattern=".*\\..*\\.asc" /> <data android:pathPattern=".*\\..*\\..*\\.asc" /> @@ -641,7 +643,6 @@ <data android:pathPattern="/pks/lookup.*"/> </intent-filter> - <!-- Keychain's own Actions --> <!-- IMPORT_KEY with files TODO: does this work? --> <intent-filter android:label="@string/intent_import_key"> <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" /> |