ObjXMPP  Check-in [b0b4a4460a]

Overview
Comment:XMPPDiscoEntity: Update JID on resource bind
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: b0b4a4460a8881bf77d14d85991953bd882f22e1ac49377df396f8f99c2c0f75
User & Date: florob@babelmonkeys.de on 2013-06-05 19:01:39
Other Links: manifest | tags
Context
2013-06-09
10:54
XMPPContactManager: Indentation fixes check-in: 46102a816a user: florob@babelmonkeys.de tags: trunk
2013-06-05
19:01
XMPPDiscoEntity: Update JID on resource bind check-in: b0b4a4460a user: florob@babelmonkeys.de tags: trunk
19:00
XMPPMulticastDelegate: Iterate over a copy of the delegates array check-in: 99f879bb8e user: florob@babelmonkeys.de tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/XMPPDiscoEntity.h from [2a4c622dd5] to [03ee22a189].

︙︙
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76

#endif

/**
 * \brief Creates a new autoreleased XMPPDiscoEntity with the specified
 *	  connection.
 *
 * \param connection The XMPPConnection to serve responses on.
 *	  This must already be bound to a resource)
 * \return A new autoreleased XMPPDiscoEntity
 */
+ discoEntityWithConnection: (XMPPConnection*)connection;

/**
 * \brief Creates a new autoreleased XMPPDiscoEntity with the specified
 *	  connection.
 *
 * \param connection The XMPPConnection to serve responses on.
 *	  This must already be bound to a resource)
 * \param capsNode The node advertised for the entity's capabilites
 * \return A new autoreleased XMPPDiscoEntity
 */
+ discoEntityWithConnection: (XMPPConnection*)connection
		   capsNode: (OFString*)capsNode;

/**








<









<








52
53
54
55
56
57
58

59
60
61
62
63
64
65
66
67

68
69
70
71
72
73
74

#endif

/**
 * \brief Creates a new autoreleased XMPPDiscoEntity with the specified
 *	  connection.
 *
 * \param connection The XMPPConnection to serve responses on.

 * \return A new autoreleased XMPPDiscoEntity
 */
+ discoEntityWithConnection: (XMPPConnection*)connection;

/**
 * \brief Creates a new autoreleased XMPPDiscoEntity with the specified
 *	  connection.
 *
 * \param connection The XMPPConnection to serve responses on.

 * \param capsNode The node advertised for the entity's capabilites
 * \return A new autoreleased XMPPDiscoEntity
 */
+ discoEntityWithConnection: (XMPPConnection*)connection
		   capsNode: (OFString*)capsNode;

/**
︙︙

Modified src/XMPPDiscoEntity.m from [98c4d4ca4a] to [f2cbe0aedb].

︙︙
102
103
104
105
106
107
108






109
110
111
112
113
114
115


	enumerator = [_features objectEnumerator];
	while ((feature = [enumerator nextObject]) != nil)
		[caps appendFormat: @"%@<", feature];

	return [caps SHA1Hash];
}







- (BOOL)connection: (XMPPConnection*)connection
      didReceiveIQ: (XMPPIQ*)IQ
{
	if (![[IQ to] isEqual: _JID])
		return NO;









>
>
>
>
>
>








102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121


	enumerator = [_features objectEnumerator];
	while ((feature = [enumerator nextObject]) != nil)
		[caps appendFormat: @"%@<", feature];

	return [caps SHA1Hash];
}

- (void)connection: (XMPPConnection*)connection
     wasBoundToJID: (XMPPJID*)JID
{
	_JID = [JID copy];
}

- (BOOL)connection: (XMPPConnection*)connection
      didReceiveIQ: (XMPPIQ*)IQ
{
	if (![[IQ to] isEqual: _JID])
		return NO;
︙︙

Modified src/XMPPDiscoNode.m from [bbd32eb970] to [09821a03dd].

︙︙
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74

- initWithJID: (XMPPJID*)JID
	 node: (OFString*)node
	 name: (OFString*)name
{
	self = [super init];

	@try {
		if (JID == nil)
			@throw [OFInvalidArgumentException
			    exceptionWithClass: [self class]
				      selector: _cmd];

		_JID = [JID copy];
		_node= [node copy];
		_name = [name copy];
		_identities = [OFSortedList new];
		_features = [OFSortedList new];
		_childNodes = [OFMutableDictionary new];









<
<
<
<
<








56
57
58
59
60
61
62





63
64
65
66
67
68
69

- initWithJID: (XMPPJID*)JID
	 node: (OFString*)node
	 name: (OFString*)name
{
	self = [super init];

	@try {





		_JID = [JID copy];
		_node= [node copy];
		_name = [name copy];
		_identities = [OFSortedList new];
		_features = [OFSortedList new];
		_childNodes = [OFMutableDictionary new];
︙︙