From 5bdac11ef84d9ce5990536110280d7857165cf10 Mon Sep 17 00:00:00 2001
From: JesperBK <jesper.b.kjaer@gmail.com>
Date: Mon, 23 Mar 2015 11:17:01 +0100
Subject: Fixed issue where setting a passphrase to null later causes a
 NullPointerException.

---
 .../java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain')

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;
     }
 
-- 
cgit v1.2.3