Avatar Bug Fixes

Core/XMPPStream.m

@@ -45,7 +45,7 @@
 
 // Log levels: off, error, warn, info, verbose
 #if DEBUG
-  static const int xmppLogLevel = XMPP_LOG_LEVEL_INFO | XMPP_LOG_FLAG_SEND_RECV; // | XMPP_LOG_FLAG_TRACE;
+static const int xmppLogLevel = XMPP_LOG_LEVEL_INFO | XMPP_LOG_FLAG_SEND_RECV; // | XMPP_LOG_FLAG_TRACE;
 #else
   static const int xmppLogLevel = XMPP_LOG_LEVEL_WARN;
 #endif

Extensions/CoreDataStorage/XMPPCoreDataStorage.h

@@ -123,4 +123,6 @@
 **/
 @property (strong, readonly) NSManagedObjectContext *mainThreadManagedObjectContext;
 
+- (void)resetManagedObjectContext;
+
 @end

Extensions/CoreDataStorage/XMPPCoreDataStorage.m

@@ -832,6 +832,15 @@ - (void)scheduleBlock:(dispatch_block_t)block
 	}});
 }
 
+- (void)resetManagedObjectContext
+{
+	XMPPLogTrace();
+
+	[self executeBlock:^{
+		[[self managedObjectContext] reset];
+	}];
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark Memory Management
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Extensions/Roster/XMPPRoster.m

@@ -804,4 +804,36 @@ - (void)xmppvCardAvatarModule:(XMPPvCardAvatarModule *)vCardTempModule
 
 #endif
 
+- (void)refetchRoster
+{
+	// This is a public method, so it may be invoked on any thread/queue.
+
+	dispatch_block_t block = ^{ @autoreleasepool {
+
+        [self setRequestedRoster:NO];
+        [self setHasRoster:NO];
+
+        [earlyPresenceElements removeAllObjects];
+
+		// <iq type="get">
+		//   <query xmlns="jabber:iq:roster"/>
+		// </iq>
+
+		NSXMLElement *query = [NSXMLElement elementWithName:@"query" xmlns:@"jabber:iq:roster"];
+
+		NSXMLElement *iq = [NSXMLElement elementWithName:@"iq"];
+		[iq addAttributeWithName:@"type" stringValue:@"get"];
+		[iq addChild:query];
+
+		[xmppStream sendElement:iq];
+
+		[self setRequestedRoster:YES];
+	}};
+
+	if (dispatch_get_current_queue() == moduleQueue)
+		block();
+	else
+		dispatch_async(moduleQueue, block);
+}
+
 @end

Extensions/XEP-0054/CoreDataStorage/XMPPvCardCoreDataStorageObject.m

@@ -109,7 +109,7 @@ - (NSData *)photoData {
 
 - (void)setPhotoData:(NSData *)photoData
 {
-	if (photoData == nil)
+	if ([photoData length] == 0)
 	{
 		if (self.vCardAvatarRel != nil)
 		{

Extensions/XEP-0054/XMPPvCardTempModule.h

@@ -9,7 +9,9 @@
 
 #import <Foundation/Foundation.h>
 #import "XMPP.h"
-#import "XMPPvCardTemp.h"
+
+@class XMPPvCardTemp;
+@class XMPPIDTracker;
 
 #define _XMPP_VCARD_TEMP_MODULE_H
 
@@ -19,6 +21,7 @@
 @interface XMPPvCardTempModule : XMPPModule
 {
 	id <XMPPvCardTempModuleStorage> __strong _moduleStorage;
+    XMPPIDTracker *myvCardTracker;
 }
 
 
@@ -48,6 +51,11 @@
         didReceivevCardTemp:(XMPPvCardTemp *)vCardTemp 
                      forJID:(XMPPJID *)jid;
 
+- (void)xmppvCardTempModuleDidUpdateMyvCard:(XMPPvCardTempModule *)vCardTempModule;
+
+- (void)xmppvCardTempModule:(XMPPvCardTempModule *)vCardTempModule failedToUpdateMyvCard:(NSXMLElement *)error;
+
+
 @end
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Extensions/XEP-0054/XMPPvCardTempModule.m

@@ -9,6 +9,8 @@
 #import "XMPP.h"
 #import "XMPPLogging.h"
 #import "XMPPvCardTempModule.h"
+#import "XMPPvCardTemp.h"
+#import "XMPPIDTracker.h"
 
 #if ! __has_feature(objc_arc)
 #warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
@@ -81,6 +83,8 @@ - (BOOL)activate:(XMPPStream *)aXmppStream
 	{
 		// Custom code goes here (if needed)
 
+        myvCardTracker = [[XMPPIDTracker alloc] initWithDispatchQueue:moduleQueue];
+
 		return YES;
 	}
 
@@ -90,6 +94,18 @@ - (BOOL)activate:(XMPPStream *)aXmppStream
 - (void)deactivate
 {
 	// Custom code goes here (if needed)
+
+    dispatch_block_t block = ^{ @autoreleasepool {
+
+		[myvCardTracker removeAllIDs];
+		myvCardTracker = nil;
+
+	}};
+
+	if (dispatch_get_current_queue() == moduleQueue)
+		block();
+	else
+		dispatch_sync(moduleQueue, block);
 
 	[super deactivate];
 }
@@ -145,13 +161,29 @@ - (XMPPvCardTemp *)myvCardTemp
 
 - (void)updateMyvCardTemp:(XMPPvCardTemp *)vCardTemp
 {
-	XMPPvCardTemp *newvCardTemp = [vCardTemp copy];
+
+    dispatch_block_t block = ^{ @autoreleasepool {
 
-	NSString *elemId = [xmppStream generateUUID];
-	XMPPIQ *iq = [XMPPIQ iqWithType:@"set" to:nil elementID:elemId child:newvCardTemp];
-	[xmppStream sendElement:iq];
+        XMPPvCardTemp *newvCardTemp = [vCardTemp copy];
 
-	[self _updatevCardTemp:newvCardTemp forJID:[xmppStream myJID]];
+        NSString *myvCardElementID = [xmppStream generateUUID];
+
+        XMPPIQ *iq = [XMPPIQ iqWithType:@"set" to:nil elementID:myvCardElementID child:newvCardTemp];
+        [xmppStream sendElement:iq];
+
+        [myvCardTracker addID:myvCardElementID
+                       target:self
+                     selector:@selector(handleMyvcard:withInfo:)
+                      timeout:60];
+
+        [self _updatevCardTemp:newvCardTemp forJID:[xmppStream myJID]];
+
+    }};
+
+	if (dispatch_get_current_queue() == moduleQueue)
+		block();
+	else
+		dispatch_sync(moduleQueue, block);
 
 }
 
@@ -161,6 +193,10 @@ - (void)updateMyvCardTemp:(XMPPvCardTemp *)vCardTemp
 
 - (void)_updatevCardTemp:(XMPPvCardTemp *)vCardTemp forJID:(XMPPJID *)jid
 {
+    if(jid == nil){
+        return;
+    }
+
 	// this method could be called from anywhere
 	dispatch_block_t block = ^{ @autoreleasepool {
 
@@ -179,6 +215,20 @@ - (void)_updatevCardTemp:(XMPPvCardTemp *)vCardTemp forJID:(XMPPJID *)jid
 		dispatch_async(moduleQueue, block);
 }
 
+- (void)handleMyvcard:(XMPPIQ *)iq withInfo:(XMPPBasicTrackingInfo *)trackerInfo{
+
+    if([iq isResultIQ])
+    {
+        [(id <XMPPvCardTempModuleDelegate>)multicastDelegate xmppvCardTempModuleDidUpdateMyvCard:self];
+    }
+    else if([iq isErrorIQ])
+    {
+        NSXMLElement *errorElement = [iq elementForName:@"error"];
+        [(id <XMPPvCardTempModuleDelegate>)multicastDelegate xmppvCardTempModule:self failedToUpdateMyvCard:errorElement];
+    }        
+
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark XMPPStreamDelegate methods
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -187,11 +237,14 @@ - (BOOL)xmppStream:(XMPPStream *)sender didReceiveIQ:(XMPPIQ *)iq
 {
 	// This method is invoked on the moduleQueue.
 
+    [myvCardTracker invokeForID:[iq elementID] withObject:iq];
+
 	// Remember XML heirarchy memory management rules.
 	// The passed parameter is a subnode of the IQ, and we need to pass it to an asynchronous operation.
 	// 
 	// Therefore we use vCardTempCopyFromIQ instead of vCardTempSubElementFromIQ.
 
+
 	XMPPvCardTemp *vCardTemp = [XMPPvCardTemp vCardTempCopyFromIQ:iq];
 	if (vCardTemp != nil)
 	{
@@ -203,4 +256,9 @@ - (BOOL)xmppStream:(XMPPStream *)sender didReceiveIQ:(XMPPIQ *)iq
 	return NO;
 }
 
+- (void)xmppStreamDidDisconnect:(XMPPStream *)sender withError:(NSError *)error
+{
+	[myvCardTracker removeAllIDs];
+}
+
 @end

Extensions/XEP-0115/XMPPCapabilities.m

@@ -1532,19 +1532,36 @@ - (XMPPPresence *)xmppStream:(XMPPStream *)sender willSendPresence:(XMPPPresence
 	}
 	else if ([type isEqualToString:@"available"])
 	{
-		if (myCapabilitiesQuery == nil)
-		{
-			// It appears we haven't collected our list of capabilites yet.
-			// This will need to be done before we can add the hash to the outgoing presence element.
-
-			[self collectMyCapabilities];
-		}
-		else if (myCapabilitiesC)
-		{
-			NSXMLElement *c = [myCapabilitiesC copy];
-
-			[presence addChild:c];
-		}
+
+        NSXMLElement *cElement = [presence elementForName:@"c" xmlns:XMLNS_CAPS];
+
+        //Remove the existing C Element
+        if(cElement)
+        {
+            NSUInteger currentCElementIndex = [[presence children] indexOfObject:cElement];
+
+            if(currentCElementIndex != NSNotFound)
+            {
+                [presence removeChildAtIndex:currentCElementIndex];
+            }
+        }
+
+        // The capabilities have already been set (maybe the existing presence is being resent?)
+        // So don't add them again
+
+        if (myCapabilitiesQuery == nil)
+        {
+            // It appears we haven't collected our list of capabilites yet.
+            // This will need to be done before we can add the hash to the outgoing presence element.
+
+            [self collectMyCapabilities];
+        }
+        else if (myCapabilitiesC)
+        {
+            NSXMLElement *c = [myCapabilitiesC copy];
+
+            [presence addChild:c];
+        }
 	}
 
 	return presence;