diff options
author | Daniel Albert <albert_daniel@t-online.de> | 2014-07-16 18:49:16 +0200 |
---|---|---|
committer | Daniel Albert <albert_daniel@t-online.de> | 2014-07-16 18:49:16 +0200 |
commit | d63534d6559f846b670f07bcc99fdd85ebe9cb3a (patch) | |
tree | 85d0135e80668347f5438ef4f85e134049491e8c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java | |
parent | e375cde7e1a09df33c65a44ba57f3f75f2f98b15 (diff) | |
parent | 82af9672fdc7f548eb801c29d123c824ea286cdc (diff) | |
download | open-keychain-d63534d6559f846b670f07bcc99fdd85ebe9cb3a.tar.gz open-keychain-d63534d6559f846b670f07bcc99fdd85ebe9cb3a.tar.bz2 open-keychain-d63534d6559f846b670f07bcc99fdd85ebe9cb3a.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java | 2 |
1 files changed, 1 insertions, 1 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 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"); } |