passphrasecache: cache by master key, introduce preference for cache by subkey

1 files changed, 6 insertions, 5 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
index ddd5fb5f0..decd1757f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -64,7 +64,6 @@ public class PassphraseDialogActivity extends FragmentActivity {
     // special extra for OpenPgpService
     public static final String EXTRA_DATA = "data";
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -251,8 +250,9 @@ public class PassphraseDialogActivity extends FragmentActivity {
 
                     // Early breakout if we are dealing with a symmetric key
                     if (mSecretRing == null) {
-                        PassphraseCacheService.addCachedPassphrase(getActivity(), Constants.key.symmetric,
-                                passphrase, getString(R.string.passp_cache_notif_pwd));
+                        PassphraseCacheService.addCachedPassphrase(getActivity(),
+                                Constants.key.symmetric, Constants.key.symmetric,  passphrase,
+                                getString(R.string.passp_cache_notif_pwd));
 
                         finishCaching(passphrase);
                         return;
@@ -309,8 +309,9 @@ public class PassphraseDialogActivity extends FragmentActivity {
                             Log.d(Constants.TAG, "Everything okay! Caching entered passphrase");
 
                             try {
-                                PassphraseCacheService.addCachedPassphrase(getActivity(), mSubKeyId,
-                                        passphrase, mSecretRing.getPrimaryUserIdWithFallback());
+                                PassphraseCacheService.addCachedPassphrase(getActivity(),
+                                        mSecretRing.getMasterKeyId(), mSubKeyId, passphrase,
+                                        mSecretRing.getPrimaryUserIdWithFallback());
                             } catch (PgpGeneralException e) {
                                 Log.e(Constants.TAG, "adding of a passphrase failed", e);
                             }