mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Mitchell Livingston 2008-06-13 03:44:56 +00:00
parent 584f138975
commit 4a0bbfaad3
2 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macosx/PrefsController.h
View File

@ -60,6 +60,7 @@
IBOutlet NSTextField * fProxyAddressField, * fProxyPasswordField;
IBOutlet NSPopUpButton * fProxyTypePopUp;
NSString * fProxyPassword;
BOOL fProxyPasswordSet;
IBOutlet NSTextField * fRPCPortField;
IBOutlet NSTableView * fRPCAccessTable;

51
macosx/PrefsController.m
View File

@ -108,6 +108,9 @@
//set proxy type
[self updateProxyType];
fProxyPasswordSet = NO;
if ([fProxyPasswordField isEnabled])
[self updateProxyPassword];
//update rpc access list
@ -209,7 +212,7 @@
proxyType = PROXY_HTTP;
}
[fProxyTypePopUp selectItemAtIndex: proxyType];
[fProxyPasswordField setStringValue: fProxyPassword];
[fProxyPasswordField setStringValue: fProxyPassword ? fProxyPassword : @""];
//set blocklist
[self updateBlocklistFields];
@ -675,6 +678,13 @@
- (void) setProxyEnabled: (id) sender
{
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];
}
}
- (void) setProxyAddress: (id) sender
@ -742,40 +752,31 @@
- (void) setProxyAuthorize: (id) sender
{
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];
}
}
- (void) setProxyUsername: (id) sender
{
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];
tr_sessionSetProxyPassword(fHandle, [fProxyPassword UTF8String]);
@ -783,20 +784,14 @@
- (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"]];
withUsername: @"Proxy"];
if (!(fProxyPassword = [keychainItem password]))
fProxyPassword = @"";
}
else
fProxyPassword = @"";
[fProxyPassword retain];
tr_sessionSetProxyPassword(fHandle, [fProxyPassword UTF8String]);