diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-30 17:14:17 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-30 17:14:17 +0200 |
commit | 677afa90fce133b81c195488e07f07a5a83e2f0b (patch) | |
tree | 127c6844082b0fdf840e10f0aad4923b80c38cf4 /OpenKeychain/src/main/java/org/sufficientlysecure | |
parent | 715188ccdaf9659aec2fec348505cd7675b62f52 (diff) | |
parent | f29d8351bad70b3c3aa80f899c3a90030bd67e17 (diff) | |
download | open-keychain-677afa90fce133b81c195488e07f07a5a83e2f0b.tar.gz open-keychain-677afa90fce133b81c195488e07f07a5a83e2f0b.tar.bz2 open-keychain-677afa90fce133b81c195488e07f07a5a83e2f0b.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java | 13 |
1 files changed, 9 insertions, 4 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 a0b470add..7c0b7eaef 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java @@ -459,11 +459,16 @@ public class PassphraseCacheService extends Service { * Called when one specific passphrase for keyId timed out */ private void timeout(long keyId) { + CachedPassphrase cPass = mPassphraseCache.get(keyId); - // clean internal char[] from memory! - cPass.getPassphrase().removeFromMemory(); - // remove passphrase object - mPassphraseCache.remove(keyId); + if (cPass != null) { + if (cPass.getPassphrase() != null) { + // clean internal char[] from memory! + cPass.getPassphrase().removeFromMemory(); + } + // remove passphrase object + mPassphraseCache.remove(keyId); + } Log.d(Constants.TAG, "PassphraseCacheService Timeout of keyId " + keyId + ", removed from memory!"); |