send caps hash in muc join

Daniel Gultsch created 9 years ago

this prevents desktop clients from iq'ing use when they join

Change summary

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 7 
1 file changed, 1 insertion(+), 6 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@@ -1838,8 +1838,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) {
@@ -1853,10 +1852,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);