From bde58c6ff134c94d58da05859ce75cbcfaabb7bf Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 30 May 2015 02:47:14 +0200
Subject: [PATCH] delete correct cache entries (important for yubikey pins!)

---
 .../keychain/service/PassphraseCacheService.java              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index 78137170d..72100677c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -411,9 +411,9 @@ public class PassphraseCacheService extends Service {
 
                     long referenceKeyId;
                     if (Preferences.getPreferences(mContext).getPassphraseCacheSubs()) {
-                        referenceKeyId = intent.getLongExtra(EXTRA_KEY_ID, 0L);
-                    } else {
                         referenceKeyId = intent.getLongExtra(EXTRA_SUBKEY_ID, 0L);
+                    } else {
+                        referenceKeyId = intent.getLongExtra(EXTRA_KEY_ID, 0L);
                     }
                     // Stop specific ttl alarm and
                     am.cancel(buildIntent(this, referenceKeyId));