Changeset 6176 for trunk/macosx/PrefsController.m

Timestamp:

Jun 13, 2008, 6:47:38 PM (14 years ago)

Author:

livings124

Message:

put some of the keychain code into methods for future expandability

File:

• trunk/macosx/PrefsController.m (modified) (5 diffs)

trunk/macosx/PrefsController.m

@@ -52 +52 @@
 #define TOOLBAR_REMOTE      @"TOOLBAR_REMOTE"
 
+#define PROXY_KEYCHAIN_SERVICE  @"Transmission:Proxy"
+#define PROXY_KEYCHAIN_NAME     @"Proxy"
+
 @interface PrefsController (Private)
 
@@ -59 +62 @@
 - (void) incompleteFolderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
 - (void) importFolderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
+
+- (void) setKeychainPassword: (NSString *) password forService: (NSString *) service username: (NSString *) username;
 
 @end
@@ -754 +759 @@
 {
     NSString * password = [[sender stringValue] retain];
-    
-    EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: @"Transmission:Proxy"
-                                            withUsername: @"Proxy"];
-    if (keychainItem)
-    {
-        if (![password isEqualToString: @""])
-            [keychainItem setPassword: password];
-        else
-            [keychainItem removeFromKeychain];
-    }
-    else
-    {
-        if (![password isEqualToString: @""])
-            [[EMKeychainProxy sharedProxy] addGenericKeychainItemForService: @"Transmission:Proxy" withUsername: @"Proxy"
-                password: password];
-    }
+    [self setKeychainPassword: password forService: PROXY_KEYCHAIN_SERVICE username: PROXY_KEYCHAIN_NAME];
     
     tr_sessionSetProxyPassword(fHandle, [password UTF8String]);
@@ -778 +768 @@
 {
     NSString * password;
-    EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: @"Transmission:Proxy"
-                                            withUsername: @"Proxy"];
+    EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: PROXY_KEYCHAIN_SERVICE
+                                            withUsername: PROXY_KEYCHAIN_NAME];
     if (!(password = [keychainItem password]))
         password = @"";
@@ -1132 +1122 @@
 }
 
+- (void) setKeychainPassword: (NSString *) password forService: (NSString *) service username: (NSString *) username
+{
+    BOOL shouldAdd = ![password isEqualToString: @""];
+    
+    EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: service withUsername: username];
+    if (keychainItem)
+    {
+        if (shouldAdd)
+            [keychainItem setPassword: password];
+        else
+            [keychainItem removeFromKeychain];
+    }
+    else
+    {
+        if (shouldAdd)
+            [[EMKeychainProxy sharedProxy] addGenericKeychainItemForService: service withUsername: username password: password];
+    }
+}
+
 @end