• R/O
  • SSH
  • HTTPS

iphotouploader: Commit


Commit MetaInfo

Revision38 (tree)
Time2009-11-10 22:30:44
Authoritok

Log Message

- flickrログアウト後にログインできなくなる問題を修正
- flickr tokenアクセス中にボタンを使用不可に

Change Summary

Incremental Difference

--- trunk/src/common/PUUserDefaults.h (revision 37)
+++ trunk/src/common/PUUserDefaults.h (revision 38)
@@ -38,6 +38,7 @@
3838
3939 -(void) setObject:(id)obj forKey:(id)key;
4040 -(id) objectForKey:(id)key;
41+-(void) removeObjectForKey:(id)key;
4142 -(BOOL) synchronize;
4243
4344 @end
--- trunk/src/common/PUUserDefaults.m (revision 37)
+++ trunk/src/common/PUUserDefaults.m (revision 38)
@@ -81,6 +81,13 @@
8181 return nil;
8282 }
8383
84+-(void) removeObjectForKey:(id)key
85+{
86+ if (key) {
87+ [m_plist removeObjectForKey:key];
88+ }
89+}
90+
8491 -(BOOL) synchronize
8592 {
8693 return [m_plist writeToFile:m_path atomically:YES];
--- trunk/src/flickr/FlickrService.h (revision 37)
+++ trunk/src/flickr/FlickrService.h (revision 38)
@@ -33,6 +33,7 @@
3333 NSString* _frob;
3434 NSString* _token;
3535 NSString* _authBtnTitle;
36+ BOOL _enableButton;
3637 }
3738
3839 -(IBAction) authorization:(id)sender;
--- trunk/src/flickr/FlickrService.m (revision 37)
+++ trunk/src/flickr/FlickrService.m (revision 38)
@@ -89,6 +89,8 @@
8989 Flickr_Auth_GetToken* req = [[Flickr_Auth_GetToken alloc] initWithFrob:_frob];
9090 [req setDelegate:self];
9191 [req start];
92+
93+ [self setValue:[NSNumber numberWithBool:NO] forKey:@"enableButton"];
9294 }
9395 }
9496 }
@@ -99,10 +101,14 @@
99101 ret = NSRunAlertPanel(LOCALIZED(@"Return to this window after you have finished the remove process on Flickr.com"), LOCALIZED(@"Once you're done, click the 'Complete Remove' button below"), LOCALIZED(@"Complete Remove"), LOCALIZED(@"Cancel"), @"");
100102 if (ret == NSAlertDefaultReturn) {
101103 PUUserDefaults* defaults = [PUUserDefaults standardUserDefaults];
102- [defaults setObject:nil forKey:@"Flickr_Token"];
104+ [defaults removeObjectForKey:@"Flickr_Token"];
103105 [defaults synchronize];
104106 [FlickrRequest setToken:nil];
107+
105108 [self setValue:LOCALIZED(@"Login...") forKey:@"authBtnTitle"];
109+
110+ // frobを再取得
111+ [self login];
106112 }
107113 }
108114 }
@@ -128,6 +134,7 @@
128134 if (xml && [xml isKindOfClass:[NSXMLDocument class]]) {
129135 [self setValue:[[xml rootElement] objectValueForXPath:@"/rsp/frob" error:nil] forKey:@"frob"];
130136 }
137+ [self setValue:[NSNumber numberWithBool:YES] forKey:@"enableButton"];
131138 } else if ([request isKindOfClass:[Flickr_Auth_GetToken class]]) {
132139 // token 取得
133140 if (xml && [xml isKindOfClass:[NSXMLDocument class]]) {
@@ -138,6 +145,7 @@
138145 [FlickrRequest setToken:_token];
139146 [self setValue:LOCALIZED(@"Logout...") forKey:@"authBtnTitle"];
140147 }
148+ [self setValue:[NSNumber numberWithBool:YES] forKey:@"enableButton"];
141149 }
142150 }
143151
@@ -196,6 +204,7 @@
196204 [self setValue:token forKey:@"token"];
197205 [FlickrRequest setToken:_token];
198206 [self setValue:LOCALIZED(@"Logout...") forKey:@"authBtnTitle"];
207+ [self setValue:[NSNumber numberWithBool:YES] forKey:@"enableButton"];
199208 } else {
200209 // token未取得
201210 // frob を取得しておく
@@ -203,6 +212,7 @@
203212 [req setDelegate:self];
204213 [req start];
205214 [self setValue:LOCALIZED(@"Login...") forKey:@"authBtnTitle"];
215+ [self setValue:[NSNumber numberWithBool:NO] forKey:@"enableButton"];
206216 }
207217 }
208218
Show on old repository browser