aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfiaxh <github@lightrise.org>2015-11-09 01:07:30 +0000
committerfiaxh <github@lightrise.org>2015-11-09 13:50:02 +0000
commitc7a519498a88235488bb3a35d6220c64f7d88d0a (patch)
tree0f2b163cb176b4d3b166727d7c42252f1437659b
parentfac1d4e0bdfcfdf01a30f2d9f88ec2c84560e33c (diff)
Sign empty status
-rw-r--r--src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java1
-rw-r--r--src/main/java/eu/siacs/conversations/ui/XmppActivity.java3
2 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
index 3e9555ca..fdfde88c 100644
--- a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
@@ -56,7 +56,6 @@ public class PresenceGenerator extends AbstractGenerator {
packet.setFrom(account.getJid());
String sig = account.getPgpSignature();
if (sig != null) {
- packet.addChild("status").setContent("online");
packet.addChild("x", "jabber:x:signed").setContent(sig);
}
String capHash = getCapHash();
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index a233717b..4cb93fde 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -476,8 +476,7 @@ public abstract class XmppActivity extends Activity {
if (account.getPgpId() == -1) {
choosePgpSignId(account);
} else {
- xmppConnectionService.getPgpEngine().generateSignature(account,
- "online", new UiCallback<Account>() {
+ xmppConnectionService.getPgpEngine().generateSignature(account, "", new UiCallback<Account>() {
@Override
public void userInputRequried(PendingIntent pi,