From d543d377b713db99aab1f03f5e45c8b46b4b4fa0 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 9 Mar 2014 03:33:32 +0100
Subject: possible null pointer fix

---
 src/eu/siacs/conversations/ui/ConversationFragment.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 62755c6c..5c552b42 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -604,10 +604,12 @@ public class ConversationFragment extends Fragment {
 				if (params[i].getEncryption() == Message.ENCRYPTION_PGP) {
 					String body = params[i].getBody();
 					String decrypted = null;
+					if (activity==null) {
+						return false;
+					} else if (!activity.xmppConnectionServiceBound) {
+						return false;
+					}
 					try {
-						if (activity==null) {
-							return false;
-						}
 						Log.d("gultsch","calling to decrypt message id #"+params[i].getUuid());
 						decrypted = activity.xmppConnectionService.getPgpEngine().decrypt(body);
 					} catch (UserInputRequiredException e) {
-- 
cgit v1.2.3