Merge remote-tracking branch 'refs/remotes/siacs/master'

1 files changed, 1 insertions, 6 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 1da05ce5e..18c72d0ca 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1833,8 +1833,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					final MucOptions mucOptions = conversation.getMucOptions();
 					final Jid joinJid = mucOptions.getSelf().getFullJid();
 					Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": joining conversation " + joinJid.toString());
-					PresencePacket packet = new PresencePacket();
-					packet.setFrom(conversation.getAccount().getJid());
+					PresencePacket packet = mPresenceGenerator.selfPresence(account, Presence.Status.ONLINE);
 					packet.setTo(joinJid);
 					Element x = packet.addChild("x", "http://jabber.org/protocol/muc");
 					if (conversation.getMucOptions().getPassword() != null) {
@@ -1848,10 +1847,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						// Fallback to muc history
 						x.addChild("history").setAttribute("since", PresenceGenerator.getTimestamp(conversation.getLastMessageTransmitted()));
 					}
-					String sig = account.getPgpSignature();
-					if (sig != null) {
-						packet.addChild("x", "jabber:x:signed").setContent(sig);
-					}
 					sendPresencePacket(account, packet);
 					if (onConferenceJoined != null) {
 						onConferenceJoined.onConferenceJoined(conversation);