diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-23 13:01:10 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-23 13:01:10 +0100 |
| commit | 30711c3fe74a5d1db8209c8725bea7e4a88ca3a8 (patch) | |
| tree | 94648b8f6837d6a0d86f01e3f168b99089584496 /OpenKeychain | |
| parent | 208434087fe9eb7bd88d491bb14db05e702d7845 (diff) | |
| parent | 5bdac11ef84d9ce5990536110280d7857165cf10 (diff) | |
| download | open-keychain-30711c3fe74a5d1db8209c8725bea7e4a88ca3a8.tar.gz open-keychain-30711c3fe74a5d1db8209c8725bea7e4a88ca3a8.tar.bz2 open-keychain-30711c3fe74a5d1db8209c8725bea7e4a88ca3a8.zip | |
Merge pull request #1174 from Jesperbk/development
Fixed symmetric encryption crash
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java index c800153ae..dd09e62c3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java @@ -136,7 +136,9 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv @Override public void setPassphrase(Passphrase passphrase) { - mPassphrase.removeFromMemory(); + if (mPassphrase != null) { + mPassphrase.removeFromMemory(); + } mPassphrase = passphrase; } |