diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-15 20:14:23 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-15 20:14:23 +0100 |
| commit | 81b810e9f6cee2ac549758563fcd8987806828a4 (patch) | |
| tree | fad63b5900e46f99b08cd45e241e560634a84aeb /OpenPGP-Keychain/src | |
| parent | e70886e24253500cd4c93be6638c485fb93efd79 (diff) | |
| download | open-keychain-81b810e9f6cee2ac549758563fcd8987806828a4.tar.gz open-keychain-81b810e9f6cee2ac549758563fcd8987806828a4.tar.bz2 open-keychain-81b810e9f6cee2ac549758563fcd8987806828a4.zip | |
intent demo, fix some intents
Diffstat (limited to 'OpenPGP-Keychain/src')
| -rw-r--r-- | OpenPGP-Keychain/src/main/AndroidManifest.xml | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml index 3b9cc1a8d..0a9c9e638 100644 --- a/OpenPGP-Keychain/src/main/AndroidManifest.xml +++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml @@ -153,12 +153,19 @@ android:windowSoftInputMode="stateHidden"> <!-- Keychain's own Actions --> + <!-- ENCRYPT with text as extra --> <intent-filter> <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT" /> <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <!-- ENCRYPT with data Uri --> + <intent-filter> + <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT" /> - <data android:mimeType="*/*" /> + <category android:name="android.intent.category.DEFAULT" /> + <!-- TODO: accept other schemes! --> + <data android:scheme="file" /> </intent-filter> <!-- Android's Send Action --> <intent-filter android:label="@string/intent_send_encrypt"> @@ -176,12 +183,19 @@ android:windowSoftInputMode="stateHidden"> <!-- Keychain's own Actions --> + <!-- DECRYPT with text as extra --> <intent-filter> <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" /> <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <!-- DECRYPT with data Uri --> + <intent-filter> + <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" /> - <data android:mimeType="*/*" /> + <category android:name="android.intent.category.DEFAULT" /> + <!-- TODO: accept other schemes! --> + <data android:scheme="file" /> </intent-filter> <!-- Android's Send Action --> <intent-filter android:label="@string/intent_send_decrypt"> @@ -293,7 +307,7 @@ <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_KEY_SERVER" /> + <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_KEY_SERVER" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> @@ -392,17 +406,17 @@ <!-- Extended Remote API --> <!--<service--> - <!--android:name="org.sufficientlysecure.keychain.service.remote.ExtendedApiService"--> - <!--android:enabled="true"--> - <!--android:exported="true"--> - <!--android:process=":remote_api">--> - <!--<intent-filter>--> - <!--<action android:name="org.sufficientlysecure.keychain.service.remote.IExtendedApiService" />--> - <!--</intent-filter>--> - - <!--<meta-data--> - <!--android:name="api_version"--> - <!--android:value="1" />--> + <!--android:name="org.sufficientlysecure.keychain.service.remote.ExtendedApiService"--> + <!--android:enabled="true"--> + <!--android:exported="true"--> + <!--android:process=":remote_api">--> + <!--<intent-filter>--> + <!--<action android:name="org.sufficientlysecure.keychain.service.remote.IExtendedApiService" />--> + <!--</intent-filter>--> + + <!--<meta-data--> + <!--android:name="api_version"--> + <!--android:value="1" />--> <!--</service>--> <!-- TODO: authority! Make this API with content provider uris --> |