aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hammann <github@honnel.de>2014-03-20 22:35:05 +0100
committerDaniel Hammann <github@honnel.de>2014-03-20 22:35:05 +0100
commit2f0075e043daab6d59e38cdb110960895a06a2b4 (patch)
tree59aa49803bdcb58c26d355caaa0e7c2f95cb937b
parent58b22d1213a8b47e5a28b012431cbfa89f08cef8 (diff)
downloadopen-keychain-2f0075e043daab6d59e38cdb110960895a06a2b4.tar.gz
open-keychain-2f0075e043daab6d59e38cdb110960895a06a2b4.tar.bz2
open-keychain-2f0075e043daab6d59e38cdb110960895a06a2b4.zip
URI is transported in intents data not extra.
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index 1231b6209..28c9c7b28 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -1002,8 +1002,8 @@ public class EncryptActivity extends DrawerActivity {
case Id.request.secret_keys: {
if (resultCode == RESULT_OK) {
- Bundle bundle = data.getExtras();
- mSecretKeyId = bundle.getLong(SelectSecretKeyActivity.RESULT_EXTRA_MASTER_KEY_ID);
+ Uri uri_master_key = data.getData();
+ mSecretKeyId = Long.valueOf(uri_master_key.getLastPathSegment());
} else {
mSecretKeyId = Id.key.none;
}