diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-10-19 12:31:11 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-10-19 12:31:11 +0200 |
commit | c3423d6ffe28bab55592ec0330b021918e042322 (patch) | |
tree | 631b7686c5f8c5402daeb3c2c52e8c9e259f62c2 /src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java | |
parent | dce8149aaec9b854853bc136eb6a9861885d4e8d (diff) |
include pgp signature only in non anonymous mucs
Diffstat (limited to 'src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java index f9fed914..f8639885 100644 --- a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java @@ -38,13 +38,17 @@ public class PresenceGenerator extends AbstractGenerator { } public PresencePacket selfPresence(Account account, Presence.Status status) { + return selfPresence(account, status, true); + } + + public PresencePacket selfPresence(Account account, Presence.Status status, boolean includePgpAnnouncement) { PresencePacket packet = new PresencePacket(); if(status.toShowString() != null) { packet.addChild("show").setContent(status.toShowString()); } packet.setFrom(account.getJid()); String sig = account.getPgpSignature(); - if (sig != null && mXmppConnectionService.getPgpEngine() != null) { + if (includePgpAnnouncement && sig != null && mXmppConnectionService.getPgpEngine() != null) { packet.addChild("x", "jabber:x:signed").setContent(sig); } String capHash = getCapHash(); |