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
committerChristian Schneppe <christian@pix-art.de>2016-05-13 21:52:12 +0200
commit363b290138af4ba7b70dba43bb7c022850b01c1a (patch)
tree1e86133889a583936f4cd16564530a85541abd86 /src/main/java/eu/siacs/conversations/ui/XmppActivity.java
parentb65a018f0009bae63f49aa27576f63ab83aabf1a (diff)
check if pgpengine is still bound before using it
Diffstat (limited to '')
-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 223e931a0..478bd5f05 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -547,6 +547,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;