Remove fast enumeration code to make the library buildable on OS X 10.4.

hyuni · Oct 10, 2011 · ea7fd90 · ea7fd90
1 parent 250f893
commit ea7fd90
Showing 1 changed file with 28 additions and 8 deletions.
diff --git a/Source/ObjectiveFlickr.m b/Source/ObjectiveFlickr.m
@@ -340,8 +340,9 @@ - (NSDictionary *)signedOAuthHTTPQueryArguments:(NSDictionary *)inArguments base
     [baseString appendString:@"&"];
 
     NSMutableArray *baseStrArgs = [NSMutableArray array];
-
-    for (NSString *k in sortedArgKeys) {
+    NSEnumerator *kenum = [sortedArgKeys objectEnumerator];
+    NSString *k;
+    while ((k = [kenum nextObject]) != nil) {
         [baseStrArgs addObject:[NSString stringWithFormat:@"%@=%@", k, OFEscapedURLStringFromNSStringWithExtraEscapedChars([newArgs objectForKey:k], kEscapeChars)]];
     }
 
@@ -357,8 +358,10 @@ - (NSURL *)oauthURLFromBaseURL:(NSURL *)inURL method:(NSString *)inMethod argume
 {
     NSDictionary *newArgs = [self signedOAuthHTTPQueryArguments:inArguments baseURL:inURL method:inMethod];
     NSMutableArray *queryArray = [NSMutableArray array];
-
-    for (NSString *k in [newArgs allKeys]) {
+
+    NSEnumerator *kenum = [newArgs keyEnumerator];
+    NSString *k;
+    while ((k = [kenum nextObject]) != nil) {
         [queryArray addObject:[NSString stringWithFormat:@"%@=%@", k, OFEscapedURLStringFromNSStringWithExtraEscapedChars([newArgs objectForKey:k], kEscapeChars)]];
     }
 
@@ -551,12 +554,29 @@ - (BOOL)uploadImageStream:(NSInputStream *)inImageStream suggestedFilename:(NSSt
         return NO;
     }
 
-    if (![[context authToken] length]) {
+    // get the api_sig
+    NSArray *argComponents = nil;
+
+    if ([context OAuthToken] && [context OAuthTokenSecret]) {
+        NSMutableArray *newArgsComps = [NSMutableArray array];
+        NSDictionary *signedArgs = [context signedOAuthHTTPQueryArguments:(inArguments ? inArguments : [NSDictionary dictionary]) baseURL:[NSURL URLWithString:[context uploadEndpoint]] method:LFHTTPRequestPOSTMethod];
+
+        NSEnumerator *keyEnum = [signedArgs keyEnumerator];
+        NSString *key;
+        while ((key = [keyEnum nextObject]) != nil) {
+            NSString *value = [signedArgs valueForKey:key];
+            [newArgsComps addObject:[NSArray arrayWithObjects:key, value, nil]];
+        }
+
+        argComponents = newArgsComps;
+    }
+    else if ([[context authToken] length] > 0) {
+        argComponents = [[self context] signedArgumentComponentsFromArguments:(inArguments ? inArguments : [NSDictionary dictionary]) useURIEscape:NO];
+    }
+    else {
         return NO;
     }
-
-    // get the api_sig
-    NSArray *argComponents = [[self context] signedArgumentComponentsFromArguments:(inArguments ? inArguments : [NSDictionary dictionary]) useURIEscape:NO];
+
     NSString *separator = OFGenerateUUIDString();
     NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", separator];