narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

send register IQs without full from

Browse source
This commit is contained in:
Daniel Gultsch 2016-08-25 13:50:54 +02:00
parent f1ecbf2ff8
commit 0b9d38cf32
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/generator/IqGenerator.java
View file

@ -321,7 +321,7 @@ public class IqGenerator extends AbstractGenerator {
public IqPacket generateCreateAccountWithCaptcha(Account account, String id, Data data) { public IqPacket generateCreateAccountWithCaptcha(Account account, String id, Data data) {
final IqPacket register = new IqPacket(IqPacket.TYPE.SET); final IqPacket register = new IqPacket(IqPacket.TYPE.SET);
register.setFrom(account.getJid().toBareJid());
register.setTo(account.getServer()); register.setTo(account.getServer());
register.setId(id); register.setId(id);
Element query = register.query("jabber:iq:register"); Element query = register.query("jabber:iq:register");

2
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -3111,7 +3111,7 @@ public class XmppConnectionService extends Service {
final XmppConnection connection = account.getXmppConnection(); final XmppConnection connection = account.getXmppConnection();
if (connection != null) { if (connection != null) {
IqPacket request = mIqGenerator.generateCreateAccountWithCaptcha(account, id, data); IqPacket request = mIqGenerator.generateCreateAccountWithCaptcha(account, id, data);
sendIqPacket(account, request, connection.registrationResponseListener); connection.sendUnmodifiedIqPacket(request, connection.registrationResponseListener);
} }
} }

7
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -879,7 +879,7 @@ public class XmppConnection implements Runnable {
final IqPacket register = new IqPacket(IqPacket.TYPE.GET); final IqPacket register = new IqPacket(IqPacket.TYPE.GET);
register.query("jabber:iq:register"); register.query("jabber:iq:register");
register.setTo(account.getServer()); register.setTo(account.getServer());
sendIqPacket(register, new OnIqPacketReceived() { sendUnmodifiedIqPacket(register, new OnIqPacketReceived() {
@Override @Override
public void onIqPacketReceived(final Account account, final IqPacket packet) { public void onIqPacketReceived(final Account account, final IqPacket packet) {
@ -892,7 +892,8 @@ public class XmppConnection implements Runnable {
final Element password = new Element("password").setContent(account.getPassword()); final Element password = new Element("password").setContent(account.getPassword());
register.query("jabber:iq:register").addChild(username); register.query("jabber:iq:register").addChild(username);
register.query().addChild(password); register.query().addChild(password);
sendIqPacket(register, registrationResponseListener); register.setFrom(account.getJid().toBareJid());
sendUnmodifiedIqPacket(register, registrationResponseListener);
} else if (packet.getType() == IqPacket.TYPE.RESULT } else if (packet.getType() == IqPacket.TYPE.RESULT
&& (packet.query().hasChild("x", "jabber:x:data"))) { && (packet.query().hasChild("x", "jabber:x:data"))) {
final Data data = Data.parse(packet.query().findChild("x", "jabber:x:data")); final Data data = Data.parse(packet.query().findChild("x", "jabber:x:data"));
@ -1258,7 +1259,7 @@ public class XmppConnection implements Runnable {
return this.sendUnmodifiedIqPacket(packet, callback); return this.sendUnmodifiedIqPacket(packet, callback);
} }
private synchronized String sendUnmodifiedIqPacket(final IqPacket packet, final OnIqPacketReceived callback) { public synchronized String sendUnmodifiedIqPacket(final IqPacket packet, final OnIqPacketReceived callback) {
if (packet.getId() == null) { if (packet.getId() == null) {
final String id = nextRandomId(); final String id = nextRandomId();
packet.setAttribute("id", id); packet.setAttribute("id", id);