diff options
| author | Christian S <christian@pix-art.de> | 2015-09-18 12:25:12 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-09-18 12:25:12 +0200 |
| commit | a3c12ed17d9468aef95521f4fa9ae5dfeaf91abd (patch) | |
| tree | 321d53cbee15dcc004fe68172edc8221be396855 /src/main/java/eu/siacs/conversations/xmpp | |
| parent | eb829eb307b69989ae4efdcb23cf2d8a28979b33 (diff) | |
| parent | b54b4ca78a85055292ea54b5acfaaec25c43f412 (diff) | |
copy commits
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 2 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/forms/Field.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index a65f51fef..870f50d5d 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -480,7 +480,7 @@ public class XmppConnection implements Runnable { final Pair<IqPacket, OnIqPacketReceived> packetCallbackDuple = packetCallbacks.get(packet.getId()); // Packets to the server should have responses from the server if (packetCallbackDuple.first.toServer(account)) { - if (packet.fromServer(account)) { + if (packet.fromServer(account) || account.getJid().getDomainpart().equals("chat.facebook.com")) { callback = packetCallbackDuple.second; packetCallbacks.remove(packet.getId()); } else { diff --git a/src/main/java/eu/siacs/conversations/xmpp/forms/Field.java b/src/main/java/eu/siacs/conversations/xmpp/forms/Field.java index ee2c51a9c..c83880005 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/forms/Field.java +++ b/src/main/java/eu/siacs/conversations/xmpp/forms/Field.java @@ -16,7 +16,7 @@ public class Field extends Element { super("field"); } - public String getName() { + public String getFieldName() { return this.getAttribute("var"); } |