diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-16 00:22:45 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-16 00:22:45 +0200 |
commit | d3c54d5f129ca24cbfa08208fc5c79c626897d4b (patch) | |
tree | bc42c88d6741c39a79f18a85a8b7c8c2ba7e6ba7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | 64b87f75be6e9d47ef2e799c8899cc00b751f528 (diff) | |
download | open-keychain-d3c54d5f129ca24cbfa08208fc5c79c626897d4b.tar.gz open-keychain-d3c54d5f129ca24cbfa08208fc5c79c626897d4b.tar.bz2 open-keychain-d3c54d5f129ca24cbfa08208fc5c79c626897d4b.zip |
Fallback if no primary user id exists
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
2 files changed, 2 insertions, 2 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 1e4e926e9..9a4cef2f1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -351,7 +351,7 @@ public class KeychainIntentService extends IntentService // cache new passphrase if (saveParcel.mNewPassphrase != null) { PassphraseCacheService.addCachedPassphrase(this, ring.getMasterKeyId(), - saveParcel.mNewPassphrase, ring.getPublicKey().getPrimaryUserId()); + saveParcel.mNewPassphrase, ring.getPublicKey().getPrimaryUserIdWithFallback()); } } catch (ProviderHelper.NotFoundException e) { sendErrorToHandler(e); 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 72c1a8f67..13d9b497f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java @@ -191,7 +191,7 @@ public class PassphraseCacheService extends Service { Log.d(Constants.TAG, "Key has no passphrase! Caches and returns empty passphrase!"); try { - addCachedPassphrase(this, keyId, "", key.getPrimaryUserId()); + addCachedPassphrase(this, keyId, "", key.getPrimaryUserIdWithFallback()); } catch (PgpGeneralException e) { Log.d(Constants.TAG, "PgpGeneralException occured"); } |