aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-16 19:48:04 +0200
committerAndreas Straub <andy@strb.org>2014-04-18 00:17:34 +0200
commite29ce19f202e535f44098f280650ad892c943e52 (patch)
tree28bc824a5b80c6304dfaf82ee9fa0fed5e9069f4 /src/eu/siacs/conversations
parenta04d736f75c793dc943c1e0ce7c89e1c20a3a684 (diff)
fixed #63
Diffstat (limited to 'src/eu/siacs/conversations')
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java12
-rw-r--r--src/eu/siacs/conversations/xmpp/XmppConnection.java11
2 files changed, 21 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index e9f93a63..07f5a427 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -287,7 +287,11 @@ public class XmppConnectionService extends Service {
} else {
Contact contact = findContact(account, fromParts[0]);
if (contact == null) {
- Log.d(LOGTAG,packet.getFrom()+ " could not be found");
+ if ("subscribe".equals(type)) {
+ account.getXmppConnection().addPendingSubscription(fromParts[0]);
+ } else {
+ Log.d(LOGTAG,packet.getFrom()+ " could not be found");
+ }
return;
}
if (type == null) {
@@ -343,7 +347,7 @@ public class XmppConnectionService extends Service {
requestPresenceUpdatesFrom(contact);
}
} else {
- // TODO: ask user to handle it maybe
+ account.getXmppConnection().addPendingSubscription(fromParts[0]);
}
} else {
//Log.d(LOGTAG, packet.toString());
@@ -1232,6 +1236,10 @@ public class XmppConnectionService extends Service {
account.getXmppConnection().sendIqPacket(iq, null);
if (autoGrant) {
requestPresenceUpdatesFrom(contact);
+ if (account.getXmppConnection().hasPendingSubscription(contact.getJid())) {
+ Log.d("xmppService","contact had pending subscription");
+ sendPresenceUpdatesTo(contact);
+ }
}
replaceContactInConversation(contact.getJid(), contact);
}
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index 41791dc2..adb27ec8 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -77,6 +77,8 @@ public class XmppConnection implements Runnable {
private Element streamFeatures;
private HashMap<String, List<String>> disco = new HashMap<String, List<String>>();
+ private HashSet<String> pendingSubscriptions = new HashSet<String>();
+
private String streamId = null;
private int smVersion = 3;
@@ -904,4 +906,13 @@ public class XmppConnection implements Runnable {
public String getMucServer() {
return findDiscoItemByFeature("http://jabber.org/protocol/muc");
}
+
+ public boolean hasPendingSubscription(String jid) {
+ return this.pendingSubscriptions.contains(jid);
+ }
+
+ public void addPendingSubscription(String jid) {
+ Log.d(LOGTAG,"adding "+jid+" to pending subscriptions");
+ this.pendingSubscriptions.add(jid);
+ }
}