aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-21 19:52:10 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-21 19:52:10 +0100
commit1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75 (patch)
treec19b5db3ecfaa2b2bf933d22d6fde80b406a6953 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
parent147003123fffc84b1d658f78d0a888479ce4ff35 (diff)
downloadopen-keychain-1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75.tar.gz
open-keychain-1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75.tar.bz2
open-keychain-1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75.zip
work on ad-hoc yubikey import support
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index ed6453e9d..5a9c146f7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -487,7 +487,7 @@ public class KeychainIntentService extends IntentService implements Progressable
case ACTION_PROMOTE_KEYRING: {
// Input
- long keyRingId = data.getInt(EXPORT_KEY_RING_MASTER_KEY_ID);
+ long keyRingId = data.getLong(PROMOTE_MASTER_KEY_ID);
// Operation
PromoteKeyOperation op = new PromoteKeyOperation(this, providerHelper, this, mActionCanceled);