From 09e20f6e01f53ff1d4c038a5ff0cbd3d7868130a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 12 May 2016 11:30:44 +0200
Subject: check if pgpengine is still bound before using it

---
 src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')

diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index b58fa6c23..5ce74824a 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -540,6 +540,9 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	protected  boolean noAccountUsesPgp() {
+		if (!hasPgp()) {
+			return true;
+		}
 		for(Account account : xmppConnectionService.getAccounts()) {
 			if (account.getPgpId() != 0) {
 				return false;
-- 
cgit v1.2.3