diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-21 16:28:48 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-21 16:28:48 +0100 |
| commit | e12598028fcb0ecb1c7c1b1fb2215074c0bcc9e3 (patch) | |
| tree | f6c2fad49e74aba098e03c75ea464330bf114f62 | |
| parent | 5b0c82b58f0f0348024477c0ae62099c4831c5d6 (diff) | |
| download | open-keychain-e12598028fcb0ecb1c7c1b1fb2215074c0bcc9e3.tar.gz open-keychain-e12598028fcb0ecb1c7c1b1fb2215074c0bcc9e3.tar.bz2 open-keychain-e12598028fcb0ecb1c7c1b1fb2215074c0bcc9e3.zip | |
AndroidManfiest code for later...
| -rw-r--r-- | OpenPGP-Keychain/src/main/AndroidManifest.xml | 24 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | 2 |
2 files changed, 23 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml index 205b3c044..480acdbd8 100644 --- a/OpenPGP-Keychain/src/main/AndroidManifest.xml +++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml @@ -182,6 +182,26 @@ 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" />--> + + <!--<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>--> <!-- Keychain's own Actions --> <!-- DECRYPT with text as extra --> <intent-filter> @@ -295,7 +315,7 @@ <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, section 7 --> + <!-- mime type as defined in http://tools.ietf.org/html/rfc3156 --> <data android:mimeType="application/pgp-keys" /> </intent-filter> <!-- NFC: Handle NFC tags detected from outside our application --> @@ -303,7 +323,7 @@ <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 --> + <!-- mime type as defined in http://tools.ietf.org/html/rfc3156 --> <data android:mimeType="application/pgp-keys" /> </intent-filter> <!-- VIEW with file endings: *.gpg (e.g. to import from OI File Manager) --> diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index 2e467aa21..652310cd2 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -297,7 +297,7 @@ public class DecryptActivity extends DrawerActivity { * Android's Action */ if (Intent.ACTION_SEND.equals(action) && type != null) { - // When sending to Keychain Encrypt via share menu + // When sending to Keychain Decrypt via share menu if ("text/plain".equals(type)) { // Plain text String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); |