More updates to modern syntax

Authentication/Digest-MD5/XMPPDigestMD5Authentication.m

@@ -110,9 +110,9 @@ - (XMPPHandleAuthResponse)handleAuth1:(NSXMLElement *)authResponse
 
 	NSDictionary *auth = [self dictionaryFromChallenge:authResponse];
 
-	realm   = [auth objectForKey:@"realm"];
-	nonce   = [auth objectForKey:@"nonce"];
-	qop     = [auth objectForKey:@"qop"];
+	realm   = auth[@"realm"];
+	nonce   = auth[@"nonce"];
+	qop     = auth[@"qop"];
 
 	// Fill out all the other variables
 	// 
@@ -160,7 +160,7 @@ - (XMPPHandleAuthResponse)handleAuth2:(NSXMLElement *)authResponse
 	if ([[authResponse name] isEqualToString:@"challenge"])
 	{
 		NSDictionary *auth = [self dictionaryFromChallenge:authResponse];
-		NSString *rspauth = [auth objectForKey:@"rspauth"];
+		NSString *rspauth = auth[@"rspauth"];
 
 		if (rspauth == nil)
 		{
@@ -244,7 +244,7 @@ - (NSDictionary *)dictionaryFromChallenge:(NSXMLElement *)challenge
 
             if(key && value)
             {
-                [auth setObject:value forKey:key];
+                auth[key] = value;
             }
 		}
 	}

Authentication/X-OAuth2-Google/XMPPXOAuth2Google.m

@@ -78,7 +78,7 @@ - (BOOL)start:(NSError **)errPtr
     if (!accessToken)
 	{
 		NSString *errMsg = @"Missing facebook accessToken.";
-		NSDictionary *info = [NSDictionary dictionaryWithObject:errMsg forKey:NSLocalizedDescriptionKey];
+		NSDictionary *info = @{NSLocalizedDescriptionKey : errMsg};
 
 		NSError *err = [NSError errorWithDomain:XMPPStreamErrorDomain code:XMPPStreamInvalidState userInfo:info];
 
@@ -158,7 +158,7 @@ - (BOOL)authenticateWithGoogleAccessToken:(NSString *)accessToken error:(NSError
 		else
 		{
 			NSString *errMsg = @"The server does not support X-OATH2-GOOGLE authentication.";
-			NSDictionary *info = [NSDictionary dictionaryWithObject:errMsg forKey:NSLocalizedDescriptionKey];
+			NSDictionary *info = @{NSLocalizedDescriptionKey : errMsg};
 
 			err = [NSError errorWithDomain:XMPPStreamErrorDomain code:XMPPStreamUnsupportedAction userInfo:info];
 

Core/XMPPMessage.m

@@ -255,7 +255,7 @@ - (NSError *)errorMessage
     NSXMLElement *error = [self elementForName:@"error"];
     return [NSError errorWithDomain:@"urn:ietf:params:xml:ns:xmpp-stanzas"
                                code:[error attributeIntValueForName:@"code"]
-                           userInfo:[NSDictionary dictionaryWithObject:[error compactXMLString] forKey:NSLocalizedDescriptionKey]];
+                           userInfo:@{NSLocalizedDescriptionKey : [error compactXMLString]}];
 
 }
 

Extensions/CoreDataStorage/XMPPCoreDataStorage.m

@@ -375,13 +375,13 @@ - (XMPPJID *)myJIDForXMPPStream:(XMPPStream *)stream
 
 		NSNumber *key = [NSNumber xmpp_numberWithPtr:(__bridge void *)stream];
 
-		result = (XMPPJID *)[myJidCache objectForKey:key];
+		result = (XMPPJID *) myJidCache[key];
 		if (!result)
 		{
 			result = [stream myJID];
 			if (result)
 			{
-				[myJidCache setObject:result forKey:key];
+				myJidCache[key] = result;
 			}
 		}
 	}};
@@ -411,7 +411,7 @@ - (void)updateJidCache:(NSNotification *)notification
 	dispatch_block_t block = ^{ @autoreleasepool {
 
 		NSNumber *key = [NSNumber xmpp_numberWithPtr:(__bridge void *)stream];
-		XMPPJID *cachedJID = [myJidCache objectForKey:key];
+		XMPPJID *cachedJID = myJidCache[key];
 
 		if (cachedJID)
 		{
@@ -421,7 +421,7 @@ - (void)updateJidCache:(NSNotification *)notification
 			{
 				if (![cachedJID isEqualToJID:newJID])
 				{
-					[myJidCache setObject:newJID forKey:key];
+					myJidCache[key] = newJID;
 					[self didChangeCachedMyJID:newJID forXMPPStream:stream];
 				}
 			}
@@ -446,7 +446,7 @@ - (void)updateJidCache:(NSNotification *)notification
 - (NSString *)persistentStoreDirectory
 {
 	NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
-    NSString *basePath = ([paths count] > 0) ? [paths objectAtIndex:0] : NSTemporaryDirectory();
+    NSString *basePath = ([paths count] > 0) ? paths[0] : NSTemporaryDirectory();
 
 	// Attempt to find a name for this application
 	NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"];
@@ -749,7 +749,7 @@ - (void)managedObjectContextDidSave:(NSNotification *)notification
 		dispatch_async(dispatch_get_main_queue(), ^{
 
             // http://stackoverflow.com/questions/3923826/nsfetchedresultscontroller-with-predicate-ignores-changes-merged-from-different
-            for (NSManagedObject *object in [[notification userInfo] objectForKey:NSUpdatedObjectsKey]) {
+            for (NSManagedObject *object in [notification userInfo][NSUpdatedObjectsKey]) {
                 [[mainThreadManagedObjectContext objectWithID:[object objectID]] willAccessValueForKey:nil];
             }
 

Extensions/XEP-0009/XMPPIQ+JabberRPC.m

@@ -143,7 +143,7 @@ +(NSXMLElement *)valueElementFromDictionary:(NSDictionary *)dictionary {
 		member = [NSXMLElement elementWithName:@"member"];
 		name = [NSXMLElement elementWithName:@"name" stringValue:key];
 		[member addChild:name];
-		[member addChild:[self valueElementFromObject:[dictionary objectForKey:key]]];
+		[member addChild:[self valueElementFromObject:dictionary[key]]];
 	}
 
 	return [self wrapValueElementAroundElement:structElement];

Extensions/XEP-0009/XMPPIQ+JabberRPCResonse.m

@@ -229,7 +229,7 @@ -(NSDictionary *)parseMember:(NSXMLElement *)memberElement {
 	NSString *key = [self objectFromElement:[memberElement elementForName:@"name"]];
 	id value = [self objectFromElement:[memberElement elementForName:@"value"]];
 
-	return [NSDictionary dictionaryWithObject:value forKey:key];	
+	return @{key : value};
 }
 
 #pragma mark -
@@ -247,19 +247,19 @@ - (NSDate *)parseDateString: (NSString *)dateString withFormat: (NSString *)form
 #pragma mark -
 
 - (NSNumber *)parseInteger: (NSString *)value {
-    return [NSNumber numberWithInteger: [value integerValue]];
+    return @([value integerValue]);
 }
 
 - (NSNumber *)parseDouble: (NSString *)value {
-    return [NSNumber numberWithDouble: [value doubleValue]];
+    return @([value doubleValue]);
 }
 
 - (NSNumber *)parseBoolean: (NSString *)value {
     if ([value isEqualToString: @"1"]) {
-        return [NSNumber numberWithBool: YES];
+        return @YES;
     }
 
-    return [NSNumber numberWithBool: NO];
+    return @NO;
 }
 
 - (NSString *)parseString: (NSString *)value {

Extensions/XEP-0009/XMPPJabberRPCModule.m

@@ -214,7 +214,7 @@ - (NSString *)sendRpcIQ:(XMPPIQ *)iq withTimeout:(NSTimeInterval)timeout
 
 	RPCID *rpcID = [[RPCID alloc] initWithRpcID:elementID timer:timer];
 
-	[rpcIDs setObject:rpcID forKey:elementID];
+	rpcIDs[elementID] = rpcID;
 
 	[xmppStream sendElement:iq];
 
@@ -225,16 +225,15 @@ - (void)timeoutRemoveRpcID:(NSString *)elementID
 {
 	XMPPLogTrace();
 
-	RPCID *rpcID = [rpcIDs objectForKey:elementID];
+	RPCID *rpcID = rpcIDs[elementID];
 	if (rpcID)
 	{
 		[rpcID cancelTimer];
 		[rpcIDs removeObjectForKey:elementID];
 
 		NSError *error = [NSError errorWithDomain:XMPPJabberRPCErrorDomain
-		                                     code:1400
-		                                 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:
-		                                          @"Request timed out", @"error",nil]];
+                                         code:1400
+                                     userInfo:@{@"error" : @"Request timed out"}];
 
 		[multicastDelegate jabberRPC:self elementID:elementID didReceiveError:error];
 	}
@@ -262,7 +261,7 @@ - (BOOL)xmppStream:(XMPPStream *)sender didReceiveIQ:(XMPPIQ *)iq
 			// we could check the query element, but we should be able to do a lookup based on the unique elementID
 			// because we send an ID, we should get one back
 
-			RPCID *rpcID =  [rpcIDs objectForKey:elementID];
+			RPCID *rpcID = rpcIDs[elementID];
 			if (rpcID == nil)
 			{
 				return NO;
@@ -290,13 +289,12 @@ - (BOOL)xmppStream:(XMPPStream *)sender didReceiveIQ:(XMPPIQ *)iq
 				// TODO: implement error parsing
 				// not much specified in XEP, only 403 forbidden error
 				NSXMLElement *errorElement = [iq childErrorElement];
-				NSError *error = [NSError errorWithDomain:XMPPJabberRPCErrorDomain 
-													 code:[errorElement attributeIntValueForName:@"code"] 
-												 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:	
-														   [errorElement attributesAsDictionary],@"error",
-														   [[errorElement childAtIndex:0] name], @"condition",
-														   iq,@"iq",
-														   nil]];
+				NSError *error = [NSError errorWithDomain:XMPPJabberRPCErrorDomain
+                                             code:[errorElement attributeIntValueForName:@"code"]
+                                         userInfo:@{
+                                                                                      @"error" : [errorElement attributesAsDictionary],
+                                                                                      @"condition" : [[errorElement childAtIndex:0] name],
+                                                                                      @"iq" : iq}];
 
 				[multicastDelegate jabberRPC:self elementID:elementID didReceiveError:error];
 			}

Extensions/XEP-0045/CoreDataStorage/XMPPRoomCoreDataStorage.m

@@ -826,7 +826,7 @@ - (NSDate *)mostRecentMessageTimestampForRoom:(XMPPJID *)roomJID
 		}
 
 		NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"localTimestamp" ascending:NO];
-		NSArray *sortDescriptors = [NSArray arrayWithObject:sortDescriptor];
+		NSArray *sortDescriptors = @[sortDescriptor];
 
 		NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
 		[fetchRequest setEntity:entity];

Extensions/XEP-0045/CoreDataStorage/XMPPRoomMessageCoreDataStorageObject.m

@@ -150,7 +150,7 @@ - (BOOL)isFromMe
 
 - (void)setIsFromMe:(BOOL)value
 {
-	self.fromMe = [NSNumber numberWithBool:value];
+	self.fromMe = @(value);
 }
 
 #pragma mark - Message

Extensions/XEP-0045/HybridStorage/XMPPRoomHybridStorage.m

@@ -607,24 +607,24 @@ - (XMPPRoomOccupantHybridMemoryStorageObject *)insertOccupantWithPresence:(XMPPP
 	XMPPJID *streamFullJid = [self myJIDForXMPPStream:xmppStream];
 	XMPPJID *roomJid = room.roomJID;
 
-	NSMutableDictionary *occupantsRoomsDict = [occupantsGlobalDict objectForKey:streamFullJid];
+	NSMutableDictionary *occupantsRoomsDict = occupantsGlobalDict[streamFullJid];
 	if (occupantsRoomsDict == nil)
 	{
 		occupantsRoomsDict = [[NSMutableDictionary alloc] init];
-		[occupantsGlobalDict setObject:occupantsRoomsDict forKey:streamFullJid];
+		occupantsGlobalDict[streamFullJid] = occupantsRoomsDict;
 	}
 
-	NSMutableDictionary *occupantsRoomDict = [occupantsRoomsDict objectForKey:roomJid];
+	NSMutableDictionary *occupantsRoomDict = occupantsRoomsDict[roomJid];
 	if (occupantsRoomDict == nil)
 	{
 		occupantsRoomDict = [[NSMutableDictionary alloc] init];
-		[occupantsRoomsDict setObject:occupantsRoomDict forKey:roomJid];
+		occupantsRoomsDict[roomJid] = occupantsRoomDict;
 	}
 
 	XMPPRoomOccupantHybridMemoryStorageObject *occupant = (XMPPRoomOccupantHybridMemoryStorageObject *)
 	    [[self.occupantClass alloc] initWithPresence:presence streamFullJid:streamFullJid];
 
-	[occupantsRoomDict setObject:occupant forKey:occupant.jid];
+	occupantsRoomDict[occupant.jid] = occupant;
 
 	return occupant;
 }
@@ -656,8 +656,8 @@ - (void)removeOccupant:(XMPPRoomOccupantHybridMemoryStorageObject *)occupant
 	XMPPJID *streamFullJid = [self myJIDForXMPPStream:stream];
 	XMPPJID *roomJid = occupant.roomJID;
 
-	NSMutableDictionary *occupantsRoomsDict = [occupantsGlobalDict objectForKey:streamFullJid];
-	NSMutableDictionary *occupantsRoomDict = [occupantsRoomsDict objectForKey:roomJid];
+	NSMutableDictionary *occupantsRoomsDict = occupantsGlobalDict[streamFullJid];
+	NSMutableDictionary *occupantsRoomDict = occupantsRoomsDict[roomJid];
 
 	[occupantsRoomDict removeObjectForKey:occupant.jid]; // Remove occupant
 	if ([occupantsRoomDict count] == 0)
@@ -715,7 +715,7 @@ - (NSDate *)mostRecentMessageTimestampForRoom:(XMPPJID *)roomJID
 		}
 
 		NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"localTimestamp" ascending:NO];
-		NSArray *sortDescriptors = [NSArray arrayWithObject:sortDescriptor];
+		NSArray *sortDescriptors = @[sortDescriptor];
 
 		NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
 		[fetchRequest setEntity:entity];
@@ -759,19 +759,19 @@ - (XMPPRoomOccupantHybridMemoryStorageObject *)occupantForJID:(XMPPJID *)occupan
 		{
 			XMPPJID *streamFullJid = [self myJIDForXMPPStream:xmppStream];
 
-			NSDictionary *occupantsRoomsDict = [occupantsGlobalDict objectForKey:streamFullJid];
-			NSDictionary *occupantsRoomDict = [occupantsRoomsDict objectForKey:roomJid];
+			NSDictionary *occupantsRoomsDict = occupantsGlobalDict[streamFullJid];
+			NSDictionary *occupantsRoomDict = occupantsRoomsDict[roomJid];
 
-			occupant = [occupantsRoomDict objectForKey:occupantJid];
+			occupant = occupantsRoomDict[occupantJid];
 		}
 		else
 		{
 			for (XMPPJID *streamFullJid in occupantsGlobalDict)
 			{
-				NSDictionary *occupantsRoomsDict = [occupantsGlobalDict objectForKey:streamFullJid];
-				NSDictionary *occupantsRoomDict = [occupantsRoomsDict objectForKey:roomJid];
+				NSDictionary *occupantsRoomsDict = occupantsGlobalDict[streamFullJid];
+				NSDictionary *occupantsRoomDict = occupantsRoomsDict[roomJid];
 
-				occupant = [occupantsRoomDict objectForKey:occupantJid];
+				occupant = occupantsRoomDict[occupantJid];
 				if (occupant) break;
 			}
 		}
@@ -802,17 +802,17 @@ - (NSArray *)occupantsForRoom:(XMPPJID *)roomJid stream:(XMPPStream *)xmppStream
 		{
 			XMPPJID *streamFullJid = [self myJIDForXMPPStream:xmppStream];
 
-			NSDictionary *occupantsRoomsDict = [occupantsGlobalDict objectForKey:streamFullJid];
-			NSDictionary *occupantsRoomDict = [occupantsRoomsDict objectForKey:roomJid];
+			NSDictionary *occupantsRoomsDict = occupantsGlobalDict[streamFullJid];
+			NSDictionary *occupantsRoomDict = occupantsRoomsDict[roomJid];
 
 			results = [occupantsRoomDict allValues];
 		}
 		else
 		{
 			for (XMPPJID *streamFullJid in occupantsGlobalDict)
 			{
-				NSDictionary *occupantsRoomsDict = [occupantsGlobalDict objectForKey:streamFullJid];
-				NSDictionary *occupantsRoomDict = [occupantsRoomsDict objectForKey:roomJid];
+				NSDictionary *occupantsRoomsDict = occupantsGlobalDict[streamFullJid];
+				NSDictionary *occupantsRoomDict = occupantsRoomsDict[roomJid];
 
 				if (occupantsRoomDict)
 				{
@@ -981,7 +981,7 @@ - (void)handleDidLeaveRoom:(XMPPRoom *)room
 
 		XMPPJID *streamFullJid = [self myJIDForXMPPStream:xmppStream];
 
-		NSMutableDictionary *occupantsRoomsDict = [occupantsGlobalDict objectForKey:streamFullJid];
+		NSMutableDictionary *occupantsRoomsDict = occupantsGlobalDict[streamFullJid];
 
 		[occupantsRoomsDict removeObjectForKey:roomJid]; // Remove room (and all associated occupants)
 	}];

Extensions/XEP-0045/HybridStorage/XMPPRoomMessageHybridCoreDataStorageObject.m

@@ -150,7 +150,7 @@ - (BOOL)isFromMe
 
 - (void)setIsFromMe:(BOOL)value
 {
-	self.fromMe = [NSNumber numberWithBool:value];
+	self.fromMe = @(value);
 }
 
 #pragma mark - Message