aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-01-19 17:22:31 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-01-19 17:22:31 +0100
commit3ac466c9db5f3a10a9d25fd7d85efb71fc7ad5dd (patch)
treeba9dc51481a244bf6d496ed6c3e39594e3e7a5d8 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
parent09e992081bbe9b4522b940177bd9bd08d692b94c (diff)
downloadopen-keychain-3ac466c9db5f3a10a9d25fd7d85efb71fc7ad5dd.tar.gz
open-keychain-3ac466c9db5f3a10a9d25fd7d85efb71fc7ad5dd.tar.bz2
open-keychain-3ac466c9db5f3a10a9d25fd7d85efb71fc7ad5dd.zip
Disable sharing chooser blacklisting for lollipop
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java2
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
index fa7abf0f5..83ba64ce2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
@@ -111,7 +111,7 @@ public class DecryptTextFragment extends DecryptFragment {
Intent prototype = createSendIntent(text);
String title = getString(R.string.title_share_file);
- // we don't want to decrypt the decypted, no inception ;)
+ // we don't want to decrypt the decrypted, no inception ;)
String[] blacklist = new String[]{
Constants.PACKAGE_NAME + ".ui.DecryptTextActivity",
"org.thialfihar.android.apg.ui.DecryptActivity"
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
index 757d1fb02..9b06a0b75 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
@@ -247,6 +247,7 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv
users.add(userId[1]);
}
}
+ // pass trough email addresses as extra for email applications
sendIntent.putExtra(Intent.EXTRA_EMAIL, users.toArray(new String[users.size()]));
}
return sendIntent;