work on ad-hoc yubikey import support

2015-03-21 19:52:10 +01:00
parent 147003123f
commit 1ad3635d13
7 changed files with 366 additions and 38 deletions
--- 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);