aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-05-12 11:30:44 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-05-12 11:30:53 +0200
commit09e20f6e01f53ff1d4c038a5ff0cbd3d7868130a (patch)
tree45caf8314143ec4dd9bfc7aa520322a07e0c9b0b /src/main/java/eu/siacs/conversations/ui/XmppActivity.java
parent1bc92482e947abde8a9660baed57b463cd55f403 (diff)
check if pgpengine is still bound before using it
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/XmppActivity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index b58fa6c2..5ce74824 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;