Ticket #1519: mobile-colloquy-keychain-fix.patch

Mobile/Controllers/CQConnectionsController.m

@@ -414 +414 @@
             [[CQKeychain standardKeychain] setPassword:password forServer:connection.server account:connection.preferredNickname];
 
         if ((password = [info objectForKey:@"password"]))
-            [[CQKeychain standardKeychain] setPassword:password forServer:connection.server account:@"<<server password>>"];
+            [[CQKeychain standardKeychain] setPassword:password forServer:connection.server account:connection.displayName];
 
         if ((password = [[CQKeychain standardKeychain] passwordForServer:connection.server account:connection.preferredNickname]) && password.length)
             connection.nicknamePassword = password;
 
-        if ((password = [[CQKeychain standardKeychain] passwordForServer:connection.server account:@"<<server password>>"]) && password.length)
+        if ((password = [[CQKeychain standardKeychain] passwordForServer:connection.server account:connection.displayName]) && password.length)
             connection.password = password;
 
         [_connections addObject:connection];

Mobile/Controllers/CQConnectionEditViewController.m

@@ -261 +261 @@
 
     BOOL placeholder = isPlaceholderValue(_connection.server);
     if (wasPlaceholder && !placeholder) {
-        [[CQKeychain standardKeychain] setPassword:_connection.password forServer:_connection.server account:@"<<server password>>"];
+        [[CQKeychain standardKeychain] setPassword:_connection.password forServer:_connection.server account:_connection.displayName];
         [[CQKeychain standardKeychain] setPassword:_connection.nicknamePassword forServer:_connection.server account:currentPreferredNickname(_connection)];
     } else if (!placeholder) {
-        _connection.password = [[CQKeychain standardKeychain] passwordForServer:_connection.server account:@"<<server password>>"];
+        _connection.password = [[CQKeychain standardKeychain] passwordForServer:_connection.server account:_connection.displayName];
         _connection.nicknamePassword = [[CQKeychain standardKeychain] passwordForServer:_connection.server account:currentPreferredNickname(_connection)];
     } else {
         _connection.password = nil;

Mobile/Controllers/CQConnectionAdvancedEditController.m

@@ -1 +1 @@
 #import "CQConnectionAdvancedEditController.h"
 
+#import "CQConnectionEditViewController.h"
 #import "CQConnectionsController.h"
 #import "CQPreferencesSwitchCell.h"
 #import "CQPreferencesListViewController.h"
@@ -291 +292 @@
     _connection.password = sender.text;
 
     if (!isPlaceholderValue(_connection.server))
-        [[CQKeychain standardKeychain] setPassword:_connection.password forServer:_connection.server account:@"<<server password>>"];
+        [[CQKeychain standardKeychain] setPassword:_connection.password forServer:_connection.server account:_connection.displayName];
 }
 
 - (void) nicknamePasswordChanged:(CQPreferencesTextCell *) sender {