Changeset 3643

Timestamp:

04/18/07 23:53:34 (1 year ago)

Author:

timothy

Message:

Add support for Jabber of SSL and Google Talk accounts.

Files:

• trunk/Chat Core/MVXMPPChatConnection.m (modified) (7 diffs)
• trunk/Chat Core/MVXMPPChatUser.h (modified) (1 diff)
• trunk/Chat Core/MVXMPPChatUser.m (modified) (2 diffs)
• trunk/Frameworks/Acid/Acid.xcodeproj/project.pbxproj (modified) (4 diffs)
• trunk/Frameworks/Acid/jabber/JabberSocket.m (modified) (1 diff)
• trunk/Panels/JVDirectChatPanel.m (modified) (8 diffs)

trunk/Chat Core/MVXMPPChatConnection.m

@@ -88 +88 @@
-        [self _willConnect];    
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -235 +245 @@
-        }
-
+        NSString *localUserStringId = [[NSString allocWithZone:nil] initWithFormat:@"%@/%@", room, [self nickname]];
-        JabberPresence *presence = [[JabberPresence allocWithZone:nil] initWithQName:JABBER_PRESENCE_QN];
-        [presence putAttribute:@"from" withValue:[_localID escapedCompleteID]];
-
-        NSString *localUserStringId = [[NSString allocWithZone:nil] initWithFormat:@"%@/%@", room, [self nickname]];
-        [presence putAttribute:@"to" withValue:localUserStringId];
-
@@ -283 +291 @@
-
-- (void) authorizationReady:(NSNotification *) notification {
-
+
+
-}
-
@@ -305 +314 @@
-
-- (void) incomingPacket:(NSNotification *) notification {
-    
+       
-        [[NSNotificationCenter defaultCenter] postNotificationName:MVChatConnectionGotRawMessageNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:string, @"message", [NSNumber numberWithBool:NO], @"outbound", nil]];
-        [string release];
@@ -311 +320 @@
-
-- (void) incomingMessage:(NSNotification *) notification {
-
-
-
-
+
+
+
+
+
+
+
+
+
-                // fall through
-    
+       
-                MVChatRoom *room = nil;
-                MVChatUser *sender = nil;
@@ -354 +368 @@
-                [msgData release];
-                [msgAttributes release];
-        
-
-
-    
-        
-    
-        
-    
+               
+
+
+       
+               
+       
+               
+       
-}
-
-- (void) incomingPresence:(NSNotification *) notification {
-    
+       
-        JabberID *roomID = [[presence from] userhostJID];
-        MVChatRoom *room = [self joinedChatRoomWithUniqueIdentifier:roomID];
@@ -423 +437 @@
-- (XMLElement *) _capabilitiesElement {
-        XMLElement *caps = [[XMLElement allocWithZone:nil] initWithQName:JABBER_CLIENTCAP_QN];
-    
-    
+       
+       
-        return [caps autorelease];
-}

trunk/Chat Core/MVXMPPChatUser.h

@@ -9 +9 @@
-        BOOL _roomMember;
-}
-- (id) initLocalUserWithConnection:(MVXMPPChatConnection *) connection;
-- (id) initWithJabberID:(JabberID *) identifier andConnection:(MVXMPPChatConnection *) connection;
-@end

trunk/Chat Core/MVXMPPChatUser.m

@@ -6 +6 @@
-
-@implementation MVXMPPChatUser
-- (id) initLocalUserWithConnection:(MVXMPPChatConnection *) userConnection {
-        if( ( self = [self initWithJabberID:[userConnection _localUserID] andConnection:userConnection] ) )
-                _type = MVChatLocalUserType;
-        return self;
-}
-
-- (id) initWithJabberID:(JabberID *) identifier andConnection:(MVXMPPChatConnection *) userConnection {
-        if( ( self = [self init] ) ) {
@@ -44 +38 @@
-        if( _roomMember )
-                return [_uniqueIdentifier resource];
-        if( _type == MVChatLocalUserType )
-                return [[self connection] username];
-        return [_uniqueIdentifier username];
-}

trunk/Frameworks/Acid/Acid.xcodeproj/project.pbxproj

@@ -52 +52 @@
-                DDBE55910BD1845D004ED228 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DDBE55900BD1845D004ED228 /* libssl.dylib */; };
-                DDBE55BA0BD187D5004ED228 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DDBE55B90BD187D5004ED228 /* libcrypto.dylib */; };
+                DDE46AAD0BD7246C0064D202 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDE46AAC0BD7246C0064D202 /* CoreServices.framework */; };
-                DDF45AC40BD5CC500050911E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
-                DDF45BBD0BD5CD6D0050911E /* AsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF45BBC0BD5CD6D0050911E /* AsyncSocket.h */; };
@@ -127 +128 @@
-                DDBE55B90BD187D5004ED228 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; };
-                DDCB77A00BD5CB8700693892 /* Acid.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Acid.pch; sourceTree = "<group>"; };
+                DDE46AAC0BD7246C0064D202 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
-                DDF45BBC0BD5CD6D0050911E /* AsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncSocket.h; path = "../../Chat Core/AsyncSocket.h"; sourceTree = SOURCE_ROOT; };
-                DDF45C0C0BD5CF0E0050911E /* Common Settings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "Common Settings.xcconfig"; path = "../../Settings/Common Settings.xcconfig"; sourceTree = SOURCE_ROOT; };
@@ -139 +141 @@
-                                DDBE55BA0BD187D5004ED228 /* libcrypto.dylib in Frameworks */,
-                                DDF45AC40BD5CC500050911E /* Foundation.framework in Frameworks */,
+                                DDE46AAD0BD7246C0064D202 /* CoreServices.framework in Frameworks */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -202 +205 @@
-                                DDBE55B90BD187D5004ED228 /* libcrypto.dylib */,
-                                DDBE55900BD1845D004ED228 /* libssl.dylib */,
+                                DDE46AAC0BD7246C0064D202 /* CoreServices.framework */,
-                                0867D69BFE84028FC02AAC07 /* Foundation.framework */,
-                        );

trunk/Frameworks/Acid/jabber/JabberSocket.m

@@ -101 +101 @@
-{}
-
+- (BOOL) socketWillConnect:(AsyncSocket *)sock {
+        if( _useSSL ) {
+                CFReadStreamSetProperty( [sock getCFReadStream], kCFStreamPropertySocketSecurityLevel, kCFStreamSocketSecurityLevelNegotiatedSSL );
+                CFWriteStreamSetProperty( [sock getCFWriteStream], kCFStreamPropertySocketSecurityLevel, kCFStreamSocketSecurityLevelNegotiatedSSL );
+
+                NSMutableDictionary *settings = [[NSMutableDictionary allocWithZone:nil] init];
+                [settings setObject:[NSNumber numberWithBool:YES] forKey:(NSString *)kCFStreamSSLAllowsAnyRoot];
+
+                CFReadStreamSetProperty( [sock getCFReadStream], kCFStreamPropertySSLSettings, (CFDictionaryRef) settings );
+                CFWriteStreamSetProperty( [sock getCFWriteStream], kCFStreamPropertySSLSettings, (CFDictionaryRef) settings );
+        }
+
+        return YES;
+}
+
-- (void) socket:(AsyncSocket *)sock didConnectToHost:(NSString *)host port:(UInt16)port
-{

trunk/Panels/JVDirectChatPanel.m

@@ -181 +181 @@
-                                int org = [[NSUserDefaults standardUserDefaults] integerForKey:@"JVChatTranscriptFolderOrganization"];
-                                if( org == 1 ) {
-connection] server
+user] serverAddress
-                                        if( ! [fileManager fileExistsAtPath:logs] ) [fileManager createDirectoryAtPath:logs attributes:nil];
-                                } else if( org == 2 ) {
-connection] server
+user] serverAddress
-                                        if( ! [fileManager fileExistsAtPath:logs] ) [fileManager createDirectoryAtPath:logs attributes:nil];
-                                } else if( org == 3 ) {
-connection] server
+user] serverAddress
-                                        if( ! [fileManager fileExistsAtPath:logs] ) [fileManager createDirectoryAtPath:logs attributes:nil];
-
@@ -204 +204 @@
-
-                                        if( org ) logName = [NSString stringWithFormat:@"%@.colloquyTranscript", [self target]];
-connection] server
+user] serverAddress
-                                        nameFound = ! [fileManager fileExistsAtPath:[logs stringByAppendingPathComponent:logName]];
-
-                                        while( ! nameFound ) {
-                                                if( org ) logName = [NSString stringWithFormat:@"%@ %d.colloquyTranscript", [self target], i++];
-connection] server
+user] serverAddress
-                                                nameFound = ! [fileManager fileExistsAtPath:[logs stringByAppendingPathComponent:logName]];
-                                        }
-                                } else if( session == 1 ) {
-                                        if( org ) logName = [NSString stringWithFormat:@"%@.colloquyTranscript", [self target]];
-connection] server
+user] serverAddress
-                                } else if( session == 2 ) {
-                                        if( org ) logName = [NSMutableString stringWithFormat:@"%@ %@.colloquyTranscript", [self target], dateString];
-connection] server
+user] serverAddress
-                                        [(NSMutableString *)logName replaceOccurrencesOfString:@"/" withString:@"-" options:NSLiteralSearch range:NSMakeRange( 0, [logName length] )];
-                                        [(NSMutableString *)logName replaceOccurrencesOfString:@":" withString:@"-" options:NSLiteralSearch range:NSMakeRange( 0, [logName length] )];
@@ -282 +282 @@
-
-/*      if( [self isMemberOfClass:[JVDirectChatPanel class]] ) {
-connection] server
-
-connection] server
+user] serverAddress
+
+user] serverAddress
-
-                [url writeToInternetLocationFile:path];
@@ -392 +392 @@
-- (NSString *) windowTitle {
-/*      if( _buddy && [_buddy preferredNameWillReturn] != JVBuddyActiveNickname )
-connection] server
+user] serverAddress
-
-        if( [[self target] isKindOfClass:[MVDirectChatConnection class]] ) {
@@ -401 +401 @@
-        }
-
-connection] server
+user] serverAddress
-}
-
-- (NSString *) information {
-/*      if( _buddy && [_buddy preferredNameWillReturn] != JVBuddyActiveNickname && ! [[self target] isEqualToString:[_buddy preferredName]] )
-connection] server
+user] serverAddress
-        if( [[self target] isKindOfClass:[MVDirectChatConnection class]] ) {
-                if( [(MVDirectChatConnection *)[self target] status] == MVDirectChatConnectionWaitingStatus )
@@ -428 +428 @@
-
-/*      if( _buddy && [_buddy preferredNameWillReturn] != JVBuddyActiveNickname )
-connection] server
+user] serverAddress
-
-        if( [[self target] isKindOfClass:[MVDirectChatConnection class]] ) {
@@ -445 +445 @@
-        }
-
-connection] server
+user] serverAddress
-}
-
@@ -527 +527 @@
-        if( [[self target] isKindOfClass:[MVDirectChatConnection class]] )
-                return [NSString stringWithFormat:@"Direct Chat %@", [self user]];
-connection] server
+user] serverAddress
-}
-