diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-21 16:21:06 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-21 16:21:06 +0100 |
| commit | 5b0c82b58f0f0348024477c0ae62099c4831c5d6 (patch) | |
| tree | cd188c0104b5e576490f6d9e91f3f1e04159d409 /OpenPGP-Keychain | |
| parent | 1ed532b6e2cfe10725aa3ad7fdfb8a6da8c9a235 (diff) | |
| download | open-keychain-5b0c82b58f0f0348024477c0ae62099c4831c5d6.tar.gz open-keychain-5b0c82b58f0f0348024477c0ae62099c4831c5d6.tar.bz2 open-keychain-5b0c82b58f0f0348024477c0ae62099c4831c5d6.zip | |
import key from email app directly
Diffstat (limited to 'OpenPGP-Keychain')
| -rw-r--r-- | OpenPGP-Keychain/src/main/AndroidManifest.xml | 62 |
1 files changed, 37 insertions, 25 deletions
diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml index 95f148686..205b3c044 100644 --- a/OpenPGP-Keychain/src/main/AndroidManifest.xml +++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml @@ -273,8 +273,9 @@ android:launchMode="singleTop" android:windowSoftInputMode="stateHidden"> - <!-- Handle URIs with fingerprints when scanning directly from Barcode Scanner --> - <intent-filter> + <!-- VIEW with fingerprint scheme: + Handle URIs with fingerprints when scanning directly from Barcode Scanner --> + <intent-filter android:label="@string/intent_import_key"> <action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.BROWSABLE" /> @@ -287,40 +288,25 @@ <data android:scheme="OpenPGP4Fpr" /> <data android:scheme="OpenPGP4fpr" /> </intent-filter> - <!-- Handle NFC tags detected from outside our application --> - <intent-filter> - <action android:name="android.nfc.action.NDEF_DISCOVERED" /> - - <category android:name="android.intent.category.DEFAULT" /> - <!-- mime type as defined in http://tools.ietf.org/html/rfc3156, section 7 --> - <data android:mimeType="application/pgp-keys" /> - </intent-filter> - <!-- Keychain's own Actions --> - <!-- IMPORT_KEY with files TODO: does this work? --> + <!-- VIEW with mimeType: Allows to import keys (attached to emails) from email apps --> <intent-filter android:label="@string/intent_import_key"> - <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" /> + <action android:name="android.intent.action.VIEW" /> + <category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.DEFAULT" /> - <data android:mimeType="*/*" /> + <!-- mime type as defined in http://tools.ietf.org/html/rfc3156, section 7 --> + <data android:mimeType="application/pgp-keys" /> </intent-filter> - <!-- IMPORT_KEY with mimeType 'application/pgp-keys' --> + <!-- NFC: Handle NFC tags detected from outside our application --> <intent-filter> - <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" /> + <action android:name="android.nfc.action.NDEF_DISCOVERED" /> <category android:name="android.intent.category.DEFAULT" /> <!-- mime type as defined in http://tools.ietf.org/html/rfc3156, section 7 --> <data android:mimeType="application/pgp-keys" /> </intent-filter> - <!-- IMPORT_KEY without mimeType to allow import with extras Bundle --> - <intent-filter android:label="@string/intent_import_key"> - <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" /> - <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_QR_CODE" /> - <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_KEYSERVER" /> - - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <!-- Linking "Import key" to file types --> + <!-- VIEW with file endings: *.gpg (e.g. to import from OI File Manager) --> <intent-filter android:label="@string/intent_import_key"> <action android:name="android.intent.action.VIEW" /> @@ -341,6 +327,7 @@ <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" /> <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" /> </intent-filter> + <!-- VIEW with file endings: *.asc --> <intent-filter android:label="@string/intent_import_key"> <action android:name="android.intent.action.VIEW" /> @@ -362,6 +349,31 @@ <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.asc" /> <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.asc" /> </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" /> + + <category android:name="android.intent.category.DEFAULT" /> + + <data android:mimeType="*/*" /> + </intent-filter> + <!-- IMPORT_KEY with mimeType 'application/pgp-keys' --> + <intent-filter> + <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" /> + + <category android:name="android.intent.category.DEFAULT" /> + <!-- mime type as defined in http://tools.ietf.org/html/rfc3156, section 7 --> + <data android:mimeType="application/pgp-keys" /> + </intent-filter> + <!-- IMPORT_KEY without mimeType to allow import with extras Bundle --> + <intent-filter android:label="@string/intent_import_key"> + <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" /> + <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_QR_CODE" /> + <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_KEYSERVER" /> + + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> </activity> <activity android:name=".ui.HelpActivity" |