diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-21 09:57:27 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-21 09:57:27 +0100 |
| commit | 81624aa648f72c55e87321768a16c0c843e64d3a (patch) | |
| tree | 59aa49803bdcb58c26d355caaa0e7c2f95cb937b | |
| parent | 58b22d1213a8b47e5a28b012431cbfa89f08cef8 (diff) | |
| parent | 2f0075e043daab6d59e38cdb110960895a06a2b4 (diff) | |
| download | open-keychain-81624aa648f72c55e87321768a16c0c843e64d3a.tar.gz open-keychain-81624aa648f72c55e87321768a16c0c843e64d3a.tar.bz2 open-keychain-81624aa648f72c55e87321768a16c0c843e64d3a.zip | |
Merge pull request #460 from honnel/uri-for-sign
URI is transported in intents data not extra. #459
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | 4 |
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; } |