@@ -407,6 +407,12 @@ enum XMPPClientFlags { if(jid == nil) return; + if([[myJID bare] isEqualToString:[jid bare]]) + { + // No, you don't need to add yourself + return; + } + // Add the buddy to our roster NSXMLElement *item = [NSXMLElement elementWithName:@"item"]; [item addAttributeWithName:@"jid" stringValue:[jid bare]]; @@ -436,6 +442,12 @@ enum XMPPClientFlags { if(jid == nil) return; + if([[myJID bare] isEqualToString:[jid bare]]) + { + // No, you shouldn't remove yourself + return; + } + // Remove the buddy from our roster // Unsubscribe from presence // And revoke contact's subscription to our presence @@ -794,7 +806,11 @@ enum XMPPClientFlags { if([iq isRosterQuery]) { - NSXMLElement *query = [iq elementForName:@"query"]; + // Note: Some jabber servers send an iq element with a xmlns. + // Because of the bug in Apple's NSXML (documented in our elementForName method), + // it is important we specify the xmlns for the query. + + NSXMLElement *query = [iq elementForName:@"query" xmlns:@"jabber:iq:roster"]; NSArray *items = [query elementsForName:@"item"]; int i; XMPPClient.m @@ -24,13 +24,16 @@ if([[subscription stringValue] isEqualToString:@"none"]) { NSXMLNode *ask = [item attributeForName:@"ask"]; - if([[ask stringValue] isEqualToString:@"subscribe"]) { + if([[ask stringValue] isEqualToString:@"subscribe"]) + { return YES; } - else { + else + { return NO; } } + return YES; } @@ -40,8 +43,14 @@ **/ - (BOOL)isRosterQuery { - NSXMLElement *query = [self elementForName:@"query"]; - return [[query xmlns] isEqualToString:@"jabber:iq:roster"]; + // Note: Some jabber servers send an iq element with a xmlns. + // Because of the bug in Apple's NSXML (documented in our elementForName method), + // it is important we specify the xmlns for the query. + + NSXMLElement *query = [self elementForName:@"query" xmlns:@"jabber:iq:roster"]; + + return (query != nil); + } @end XMPPIQ.m 3f3be60d0369da9a15a6554c1675eb9f22777057 deusty deusty@69bd8580-3047-0410-960a-a116b6c96ec9 http://github.com/tinycode/xmppframework/commit/35d9d828263400a61b80b2dc6e02c909edf1a6b7 35d9d828263400a61b80b2dc6e02c909edf1a6b7 2009-04-20T19:37:06-07:00 2009-04-20T19:37:06-07:00 Workaround for bug related to jabber servers that send an xmlns in their iq elements and a bug in Apple's NSXML git-svn-id: http://xmppframework.googlecode.com/svn/trunk@82 69bd8580-3047-0410-960a-a116b6c96ec9 4a98656fbe305f4964acd855370e140b6328ec45 deusty deusty@69bd8580-3047-0410-960a-a116b6c96ec9