Changeset 6167

Timestamp:

Jun 13, 2008, 3:44:56 AM (14 years ago)

Author:

livings124

Message:

only have a single proxy password, regardless of account name, address, etc; only attempt to grab it from the keychain when both the "enable proxy" and "enable proxy authorization" checks are enabled

Location:

trunk/macosx

Files:

• PrefsController.h (modified) (1 diff)
• PrefsController.m (modified) (6 diffs)

trunk/macosx/PrefsController.h

@@ -61 +61 @@
     IBOutlet NSPopUpButton * fProxyTypePopUp;
     NSString * fProxyPassword;
+    BOOL fProxyPasswordSet;
     
     IBOutlet NSTextField * fRPCPortField;

trunk/macosx/PrefsController.m

@@ -109 +109 @@
         //set proxy type
         [self updateProxyType];
-        [self updateProxyPassword];
+        
+        fProxyPasswordSet = NO;
+        if ([fProxyPasswordField isEnabled])
+            [self updateProxyPassword];
         
         //update rpc access list
@@ -210 +213 @@
     }
     [fProxyTypePopUp selectItemAtIndex: proxyType];
-    [fProxyPasswordField setStringValue: fProxyPassword];
+    [fProxyPasswordField setStringValue: fProxyPassword ? fProxyPassword : @""];
     
     //set blocklist
@@ -676 +679 @@
 {
     tr_sessionSetProxyEnabled(fHandle, [fDefaults boolForKey: @"Proxy"]);
+    
+    //if proxy password hasn't be retrieved, get it now
+    if (!fProxyPasswordSet && [fProxyPasswordField isEnabled])
+    {
+        [self updateProxyPassword];
+        [fProxyPasswordField setStringValue: fProxyPassword];
+    }
 }
 
@@ -743 +753 @@
 {
     tr_sessionSetProxyAuthEnabled(fHandle, [fDefaults boolForKey: @"ProxyAuthorize"]);
+    
+    //if proxy password hasn't be retrieved, get it now
+    if (!fProxyPasswordSet && [fProxyPasswordField isEnabled])
+    {
+        [self updateProxyPassword];
+        [fProxyPasswordField setStringValue: fProxyPassword];
+    }
 }
 
@@ -748 +765 @@
 {
     tr_sessionSetProxyUsername(fHandle, [[fDefaults stringForKey: @"ProxyUsername"] UTF8String]);
-    
-    //new username means new password
-    [self updateProxyPassword];
-    [fProxyPasswordField setStringValue: fProxyPassword];
 }
 
 - (void) setProxyPassword: (id) sender
 {
-    NSString * username = [fDefaults stringForKey: @"ProxyUsername"];
-    
-    //don't allow passwords to be set if no user name
-    if ([username isEqualToString: @""])
-    {
-        [sender setStringValue: @""];
-        
-        [fProxyPassword release];
-        fProxyPassword = [@"" retain];
-        return;
-    }
-    
     [fProxyPassword release];
     fProxyPassword = [[sender stringValue] retain];
     
     EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: @"Transmission:Proxy"
-                                            withUsername: username];
+                                            withUsername: @"Proxy"];
     if (keychainItem)
         [keychainItem setPassword: fProxyPassword];
     else
-        [[EMKeychainProxy sharedProxy] addGenericKeychainItemForService: @"Transmission:Proxy" withUsername: username
+        [[EMKeychainProxy sharedProxy] addGenericKeychainItemForService: @"Transmission:Proxy" withUsername: @"Proxy"
             password: fProxyPassword];
     
@@ -784 +785 @@
 - (void) updateProxyPassword
 {
+    fProxyPasswordSet = YES;
+    
     [fProxyPassword release];
     
-    NSString * username = [fDefaults stringForKey: @"ProxyUsername"];
-    
-    if (![username isEqualToString: @""])
-    {
-        EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: @"Transmission:Proxy"
-                                                withUsername: [fDefaults stringForKey: @"ProxyUsername"]];
-        if (!(fProxyPassword = [keychainItem password]))
-            fProxyPassword = @"";
-    }
-    else
+    EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: @"Transmission:Proxy"
+                                            withUsername: @"Proxy"];
+    if (!(fProxyPassword = [keychainItem password]))
         fProxyPassword = @"";
-    
     [fProxyPassword retain];