aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-13 20:07:22 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-13 20:07:22 +0200
commitd73ea5f6127ae69738d9ca4a9363fe76162755f9 (patch)
tree5de1d46bc0ccbe76bfa749ddfccaeabf2b1d1574 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
parent7d41800e57b6351503081f7316e27e64b75cc04f (diff)
downloadopen-keychain-d73ea5f6127ae69738d9ca4a9363fe76162755f9.tar.gz
open-keychain-d73ea5f6127ae69738d9ca4a9363fe76162755f9.tar.bz2
open-keychain-d73ea5f6127ae69738d9ca4a9363fe76162755f9.zip
Fix share to encrypt text
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java24
1 files changed, 4 insertions, 20 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
index 581145f8d..96f8bd983 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
@@ -452,27 +452,11 @@ public class EncryptFileActivity extends DrawerActivity implements EncryptActivi
* Android's Action
*/
+ // When sending to OpenKeychain Encrypt via share menu
if (Intent.ACTION_SEND.equals(action) && type != null) {
- // When sending to OpenKeychain Encrypt via share menu
- /* if ("text/plain".equals(type)) {
- // TODO handle, maybe forward to "encrypt text" activity?
-
- Plain text
- String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
- if (sharedText != null) {
- // handle like normal text encryption, override action and extras to later
- // executeServiceMethod ACTION_ENCRYPT_TEXT in main actions
- extras.putString(EXTRA_TEXT, sharedText);
- extras.putBoolean(EXTRA_ASCII_ARMOR, true);
- action = ACTION_ENCRYPT_TEXT;
- }
-
- } else */
- {
- // Files via content provider, override uri and action
- uris.clear();
- uris.add(intent.<Uri>getParcelableExtra(Intent.EXTRA_STREAM));
- }
+ // Files via content provider, override uri and action
+ uris.clear();
+ uris.add(intent.<Uri>getParcelableExtra(Intent.EXTRA_STREAM));
}
if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) {